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 0cdd6a0cf61c49f6e4bf0e7daa70708fab3da7b0 Author: Pasquale Congiusti <[email protected]> AuthorDate: Thu May 11 11:35:59 2023 +0200 chore(e2e): move memory limit to builder pod --- e2e/builder/build_test.go | 2 +- e2e/native/native_binding_test.go | 2 +- e2e/native/native_test.go | 5 ++++- e2e/native/native_with_sources_test.go | 6 +++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go index bc965aa36..ae4835f13 100644 --- a/e2e/builder/build_test.go +++ b/e2e/builder/build_test.go @@ -42,7 +42,7 @@ type kitOptions struct { func TestKitMaxBuildLimit(t *testing.T) { WithNewTestNamespace(t, func(ns string) { - createOperator(ns, "500Mi", "8m0s", "--global", "--force") + createOperator(ns, "8m0s", "--global", "--force") pl := Platform(ns)() // set maximum number of running builds diff --git a/e2e/native/native_binding_test.go b/e2e/native/native_binding_test.go index 57e3cf9c9..56f21f6ba 100644 --- a/e2e/native/native_binding_test.go +++ b/e2e/native/native_binding_test.go @@ -37,7 +37,6 @@ func TestNativeBinding(t *testing.T) { operatorID := "camel-k-native-binding" Expect(KamelInstallWithIDAndKameletCatalog(operatorID, ns, "--build-timeout", "90m0s", - "--operator-resources", "limits.memory=6.5Gi", "--maven-cli-option", "-Dquarkus.native.native-image-xmx=6g", ).Execute()).To(Succeed()) Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady)) @@ -64,6 +63,7 @@ func TestNativeBinding(t *testing.T) { "log-sink", "-p", "source.message="+message, "--annotation", "trait.camel.apache.org/quarkus.package-type=native", + "--annotation", "trait.camel.apache.org/builder.limit-memory=6.5Gi", "--name", bindingName, ).Execute()).To(Succeed()) diff --git a/e2e/native/native_test.go b/e2e/native/native_test.go index d7c7c2ba5..279780894 100644 --- a/e2e/native/native_test.go +++ b/e2e/native/native_test.go @@ -38,7 +38,6 @@ func TestNativeIntegrations(t *testing.T) { operatorID := "camel-k-quarkus-native" Expect(KamelInstallWithID(operatorID, ns, "--build-timeout", "90m0s", - "--operator-resources", "limits.memory=6.5Gi", "--maven-cli-option", "-Dquarkus.native.native-image-xmx=6g", ).Execute()).To(Succeed()) Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady)) @@ -47,6 +46,7 @@ func TestNativeIntegrations(t *testing.T) { name := "unsupported-js" Expect(KamelRunWithID(operatorID, ns, "files/JavaScript.js", "--name", name, "-t", "quarkus.package-type=native", + "-t", "builder.limit-memory=6.5Gi", ).Execute()).To(Succeed()) Eventually(IntegrationPhase(ns, name)).Should(Equal(v1.IntegrationPhaseError)) @@ -61,6 +61,7 @@ func TestNativeIntegrations(t *testing.T) { name := "xml-native" Expect(KamelRunWithID(operatorID, ns, "files/Xml.xml", "--name", name, "-t", "quarkus.package-type=native", + "-t", "builder.limit-memory=6.5Gi", ).Execute()).To(Succeed()) Eventually(IntegrationPodPhase(ns, name), TestTimeoutVeryLong).Should(Equal(corev1.PodRunning)) @@ -82,6 +83,7 @@ func TestNativeIntegrations(t *testing.T) { Expect(KamelRunWithID(operatorID, ns, "files/yaml.yaml", "--name", name, "-t", "quarkus.package-type=fast-jar", "-t", "quarkus.package-type=native", + "-t", "builder.limit-memory=6.5Gi", ).Execute()).To(Succeed()) // Check that two Kits are created with distinct layout @@ -133,6 +135,7 @@ func TestNativeIntegrations(t *testing.T) { name := "yaml-native-2" Expect(KamelRunWithID(operatorID, ns, "files/yaml2.yaml", "--name", name, "-t", "quarkus.package-type=native", + "-t", "builder.limit-memory=6.5Gi", ).Execute()).To(Succeed()) // This one should run quickly as it suppose to reuse an IntegrationKit diff --git a/e2e/native/native_with_sources_test.go b/e2e/native/native_with_sources_test.go index f5681d479..cb3101c84 100644 --- a/e2e/native/native_with_sources_test.go +++ b/e2e/native/native_with_sources_test.go @@ -39,7 +39,6 @@ func TestNativeHighMemoryIntegrations(t *testing.T) { operatorID := "camel-k-quarkus-high-memory-native" Expect(KamelInstallWithID(operatorID, ns, "--build-timeout", "90m0s", - "--operator-resources", "limits.memory=9.5Gi", "--maven-cli-option", "-Dquarkus.native.native-image-xmx=9g", ).Execute()).To(Succeed()) Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady)) @@ -61,6 +60,7 @@ func TestNativeHighMemoryIntegrations(t *testing.T) { name := "java-native" Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name, "-t", "quarkus.package-type=native", + "-t", "builder.limit-memory=9.5Gi", ).Execute()).To(Succeed()) Eventually(IntegrationPodPhase(ns, name), TestTimeoutVeryLong).Should(Equal(corev1.PodRunning)) @@ -74,6 +74,7 @@ func TestNativeHighMemoryIntegrations(t *testing.T) { name := "java-native-clone" Expect(KamelRunWithID(operatorID, ns, "files/Java.java", "--name", name, "-t", "quarkus.package-type=native", + "-t", "builder.limit-memory=9.5Gi", ).Execute()).To(Succeed()) // This one should run quickly as it suppose to reuse an IntegrationKit @@ -90,6 +91,7 @@ func TestNativeHighMemoryIntegrations(t *testing.T) { name := "java-native-2" Expect(KamelRunWithID(operatorID, ns, "files/Java2.java", "--name", name, "-t", "quarkus.package-type=native", + "-t", "builder.limit-memory=9.5Gi", ).Execute()).To(Succeed()) Eventually(IntegrationPodPhase(ns, name), TestTimeoutVeryLong).Should(Equal(corev1.PodRunning)) @@ -109,6 +111,7 @@ func TestNativeHighMemoryIntegrations(t *testing.T) { name := "groovy-native" Expect(KamelRunWithID(operatorID, ns, "files/Groovy.groovy", "--name", name, "-t", "quarkus.package-type=native", + "-t", "builder.limit-memory=9.5Gi", ).Execute()).To(Succeed()) Eventually(IntegrationPodPhase(ns, name), TestTimeoutVeryLong).Should(Equal(corev1.PodRunning)) @@ -127,6 +130,7 @@ func TestNativeHighMemoryIntegrations(t *testing.T) { name := "kotlin-native" Expect(KamelRunWithID(operatorID, ns, "files/Kotlin.kts", "--name", name, "-t", "quarkus.package-type=native", + "-t", "builder.limit-memory=9.5Gi", ).Execute()).To(Succeed()) Eventually(IntegrationPodPhase(ns, name), TestTimeoutVeryLong).Should(Equal(corev1.PodRunning))
