You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/05/09 15:28:25 UTC
[camel-k] branch main updated (7a8b30a9b -> bb50b03e5)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 7a8b30a9b fix: Add proper app label on default integration platform
new afb52e3ab chore(e2e): increase timeout for building builder container
new bb50b03e5 fix(e2e): high memory native test
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
e2e/native/files/Java2.java | 2 +-
e2e/native/native_binding_test.go | 18 ++++++++++++++++--
e2e/native/native_with_sources_test.go | 18 ++++++++++++++++--
3 files changed, 33 insertions(+), 5 deletions(-)
[camel-k] 01/02: chore(e2e): increase timeout for building builder container
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit afb52e3ab978c625a8b48f554beb6275c461f702
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Fri May 5 15:33:16 2023 +0200
chore(e2e): increase timeout for building builder container
---
e2e/native/native_binding_test.go | 18 ++++++++++++++++--
e2e/native/native_with_sources_test.go | 18 ++++++++++++++++--
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/e2e/native/native_binding_test.go b/e2e/native/native_binding_test.go
index 1ac2f950f..8e6aca73a 100644
--- a/e2e/native/native_binding_test.go
+++ b/e2e/native/native_binding_test.go
@@ -23,12 +23,13 @@ limitations under the License.
package native
import (
- "testing"
-
. "github.com/apache/camel-k/v2/e2e/support"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "testing"
+ "time"
)
func TestNativeBinding(t *testing.T) {
@@ -41,6 +42,19 @@ func TestNativeBinding(t *testing.T) {
).Execute()).To(Succeed())
Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ pl := Platform(ns)()
+ // set a longer timeout than default as for some reason the builder hit the timeout
+ pl.Spec.Build.BuildCatalogToolTimeout = &metav1.Duration{
+ Duration: 5 * time.Minute,
+ }
+ TestClient().Update(TestContext, pl)
+ Eventually(Platform(ns)).ShouldNot(BeNil())
+ Eventually(PlatformBuildCatalogToolTimeout(ns)).Should(Equal(
+ &metav1.Duration{
+ Duration: 5 * time.Minute,
+ },
+ ))
+
from := corev1.ObjectReference{
Kind: "Kamelet",
Name: "timer-source",
diff --git a/e2e/native/native_with_sources_test.go b/e2e/native/native_with_sources_test.go
index b5128ab95..f5681d479 100644
--- a/e2e/native/native_with_sources_test.go
+++ b/e2e/native/native_with_sources_test.go
@@ -24,13 +24,14 @@ package native
import (
"testing"
+ "time"
. "github.com/onsi/gomega"
- corev1 "k8s.io/api/core/v1"
-
. "github.com/apache/camel-k/v2/e2e/support"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ corev1 "k8s.io/api/core/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
func TestNativeHighMemoryIntegrations(t *testing.T) {
@@ -43,6 +44,19 @@ func TestNativeHighMemoryIntegrations(t *testing.T) {
).Execute()).To(Succeed())
Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ pl := Platform(ns)()
+ // set a longer timeout than default as for some reason the builder hit the timeout
+ pl.Spec.Build.BuildCatalogToolTimeout = &metav1.Duration{
+ Duration: 5 * time.Minute,
+ }
+ TestClient().Update(TestContext, pl)
+ Eventually(Platform(ns)).ShouldNot(BeNil())
+ Eventually(PlatformBuildCatalogToolTimeout(ns)).Should(Equal(
+ &metav1.Duration{
+ Duration: 5 * time.Minute,
+ },
+ ))
+
t.Run("java native support", func(t *testing.T) {
name := "java-native"
Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name,
[camel-k] 02/02: fix(e2e): high memory native test
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit bb50b03e590f6f160cb1bbd3a49247886e8cf1b3
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Tue May 9 13:00:30 2023 +0200
fix(e2e): high memory native test
Closes #4345
---
e2e/native/files/Java2.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/e2e/native/files/Java2.java b/e2e/native/files/Java2.java
index 73b29ab99..8a3f7ad4a 100644
--- a/e2e/native/files/Java2.java
+++ b/e2e/native/files/Java2.java
@@ -17,7 +17,7 @@
import org.apache.camel.builder.RouteBuilder;
- public class Java extends RouteBuilder {
+ public class Java2 extends RouteBuilder {
@Override
public void configure() throws Exception {
from("timer:tick")