This is an automated email from the ASF dual-hosted git repository. claudio4j pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push: new 9132aa7b1 Fix misc tests on global operator (#4585) 9132aa7b1 is described below commit 9132aa7b18fa7e50a6331d06839ab782da84b317 Author: Jan Bouska <jbou...@redhat.com> AuthorDate: Tue Jul 18 13:55:40 2023 +0200 Fix misc tests on global operator (#4585) --- e2e/common/misc/integration_fail_test.go | 5 +- e2e/common/misc/platformless_run_test.go | 4 ++ e2e/common/misc/structured_logs_test.go | 2 +- e2e/common/traits/builder_test.go | 107 ++++++++++++++++--------------- e2e/support/test_support.go | 13 ++++ 5 files changed, 77 insertions(+), 54 deletions(-) diff --git a/e2e/common/misc/integration_fail_test.go b/e2e/common/misc/integration_fail_test.go index d5d1444d5..18514628d 100644 --- a/e2e/common/misc/integration_fail_test.go +++ b/e2e/common/misc/integration_fail_test.go @@ -63,10 +63,11 @@ func TestBadRouteIntegration(t *testing.T) { // Integration in error Eventually(IntegrationPhase(ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseError)) kitName := IntegrationKit(ns, name)() + integrationKitNamespace := IntegrationKitNamespace(ns, name)() // Kit in error - Eventually(KitPhase(ns, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseError)) + Eventually(KitPhase(integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseError)) //Build in error with 5 attempts - build := Build(ns, kitName)() + build := Build(integrationKitNamespace, kitName)() Eventually(build.Status.Phase, TestTimeoutShort).Should(Equal(v1.BuildPhaseError)) Eventually(build.Status.Failure.Recovery.Attempt, TestTimeoutShort).Should(Equal(5)) }) diff --git a/e2e/common/misc/platformless_run_test.go b/e2e/common/misc/platformless_run_test.go index 6817f0267..d4b0d0bd6 100644 --- a/e2e/common/misc/platformless_run_test.go +++ b/e2e/common/misc/platformless_run_test.go @@ -46,6 +46,10 @@ func TestPlatformlessRun(t *testing.T) { t.Skip("This test is for OpenShift only and cannot work when a custom platform configuration is needed") return } + if os.Getenv("CAMEL_K_FORCE_GLOBAL_TEST") == "true" { + t.Skip("This test can't work with the global operator installation since the integration platform can be inherited.") + return + } // Delete the platform from the namespace before running the integration Eventually(DeletePlatform(ns)).Should(BeTrue()) diff --git a/e2e/common/misc/structured_logs_test.go b/e2e/common/misc/structured_logs_test.go index 551a2aca0..569ee7d10 100644 --- a/e2e/common/misc/structured_logs_test.go +++ b/e2e/common/misc/structured_logs_test.go @@ -57,7 +57,7 @@ func TestStructuredLogs(t *testing.T) { it := Integration(ns, name)() Expect(it).NotTo(BeNil()) - build := Build(ns, it.Status.IntegrationKit.Name)() + build := Build(IntegrationKitNamespace(ns, name)(), IntegrationKit(ns, name)())() Expect(build).NotTo(BeNil()) Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) diff --git a/e2e/common/traits/builder_test.go b/e2e/common/traits/builder_test.go index 8023ab8e5..6d7f7f2e6 100644 --- a/e2e/common/traits/builder_test.go +++ b/e2e/common/traits/builder_test.go @@ -36,7 +36,6 @@ import ( func TestBuilderTrait(t *testing.T) { RegisterTestingT(t) - operatorNamespace := GetOperatorNamespace(ns) t.Run("Run build strategy routine", func(t *testing.T) { name := "java" @@ -49,16 +48,17 @@ func TestBuilderTrait(t *testing.T) { Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) integrationKitName := IntegrationKit(ns, name)() + integrationKitNamespace := IntegrationKitNamespace(ns, name)() builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine)) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential)) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine)) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential)) // Default resource CPU Check - Eventually(BuildConfig(operatorNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("")) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("")) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("")) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("")) - Eventually(BuilderPod(operatorNamespace, builderKitName), TestTimeoutShort).Should(BeNil()) + Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil()) // We need to remove the kit as well Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed()) @@ -75,16 +75,17 @@ func TestBuilderTrait(t *testing.T) { Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) integrationKitName := IntegrationKit(ns, name)() + integrationKitNamespace := IntegrationKitNamespace(ns, name)() builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine)) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyDependencies)) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine)) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyDependencies)) // Default resource CPU Check - Eventually(BuildConfig(operatorNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("")) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("")) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("")) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("")) - Eventually(BuilderPod(operatorNamespace, builderKitName), TestTimeoutShort).Should(BeNil()) + Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil()) // We need to remove the kit as well Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed()) @@ -101,16 +102,17 @@ func TestBuilderTrait(t *testing.T) { Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) integrationKitName := IntegrationKit(ns, name)() + integrationKitNamespace := IntegrationKitNamespace(ns, name)() builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine)) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyFIFO)) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine)) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategyFIFO)) // Default resource CPU Check - Eventually(BuildConfig(operatorNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("")) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("")) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("")) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("")) - Eventually(BuilderPod(operatorNamespace, builderKitName), TestTimeoutShort).Should(BeNil()) + Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).Should(BeNil()) // We need to remove the kit as well Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed()) @@ -132,22 +134,23 @@ func TestBuilderTrait(t *testing.T) { Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) integrationKitName := IntegrationKit(ns, name)() + integrationKitNamespace := IntegrationKitNamespace(ns, name)() builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyPod)) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential)) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("500m")) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("1000m")) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("2Gi")) - Eventually(BuildConfig(operatorNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("3Gi")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyPod)) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().OrderStrategy, TestTimeoutShort).Should(Equal(v1.BuildOrderStrategySequential)) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestCPU, TestTimeoutShort).Should(Equal("500m")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitCPU, TestTimeoutShort).Should(Equal("1000m")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().RequestMemory, TestTimeoutShort).Should(Equal("2Gi")) + Eventually(BuildConfig(integrationKitNamespace, integrationKitName)().LimitMemory, TestTimeoutShort).Should(Equal("3Gi")) - Eventually(BuilderPod(operatorNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil()) + Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil()) // Let's assert we set the resources on the builder container - Eventually(BuilderPod(operatorNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder")) - Eventually(BuilderPod(operatorNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Cpu().String(), TestTimeoutShort).Should(Equal("500m")) - Eventually(BuilderPod(operatorNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Cpu().String(), TestTimeoutShort).Should(Equal("1")) - Eventually(BuilderPod(operatorNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Memory().String(), TestTimeoutShort).Should(Equal("2Gi")) - Eventually(BuilderPod(operatorNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Memory().String(), TestTimeoutShort).Should(Equal("3Gi")) + Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder")) + Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Cpu().String(), TestTimeoutShort).Should(Equal("500m")) + Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Cpu().String(), TestTimeoutShort).Should(Equal("1")) + Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Requests.Memory().String(), TestTimeoutShort).Should(Equal("2Gi")) + Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Resources.Limits.Memory().String(), TestTimeoutShort).Should(Equal("3Gi")) Expect(Kamel("reset", "-n", ns).Execute()).To(Succeed()) }) @@ -166,33 +169,34 @@ func TestBuilderTrait(t *testing.T) { Eventually(IntegrationLogs(ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) integrationKitName := IntegrationKit(ns, name)() + integrationKitNamespace := IntegrationKitNamespace(ns, name)() builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName) - Eventually(BuilderPod(operatorNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil()) - Eventually(len(BuilderPod(operatorNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(3)) - Eventually(BuilderPod(operatorNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder")) - Eventually(BuilderPod(operatorNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1")) - Eventually(BuilderPod(operatorNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("custom2")) + Eventually(BuilderPod(integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil()) + Eventually(len(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers), TestTimeoutShort).Should(Equal(3)) + Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[0].Name, TestTimeoutShort).Should(Equal("builder")) + Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[1].Name, TestTimeoutShort).Should(Equal("custom1")) + Eventually(BuilderPod(integrationKitNamespace, builderKitName)().Spec.InitContainers[2].Name, TestTimeoutShort).Should(Equal("custom2")) // Check containers conditions - Eventually(Build(operatorNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil()) + Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil()) Eventually( Build( - operatorNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status, + integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status, TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) Eventually( - Build(operatorNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message, + Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message, TestTimeoutShort).Should(ContainSubstring("generated-bytecode.jar")) - Eventually(Build(operatorNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil()) + Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutShort).ShouldNot(BeNil()) Eventually( - Build(operatorNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Status, + Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Status, TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) Eventually( - Build(operatorNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Message, + Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom2 succeeded")).Message, TestTimeoutShort).Should(ContainSubstring("</project>")) // Check logs - Eventually(Logs(operatorNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`generated-bytecode.jar`)) - Eventually(Logs(operatorNamespace, builderKitName, corev1.PodLogOptions{Container: "custom2"})).Should(ContainSubstring(`<artifactId>camel-k-runtime-bom</artifactId>`)) + Eventually(Logs(integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom1"})).Should(ContainSubstring(`generated-bytecode.jar`)) + Eventually(Logs(integrationKitNamespace, builderKitName, corev1.PodLogOptions{Container: "custom2"})).Should(ContainSubstring(`<artifactId>camel-k-runtime-bom</artifactId>`)) Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) }) @@ -207,14 +211,15 @@ func TestBuilderTrait(t *testing.T) { Eventually(IntegrationPhase(ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit)) integrationKitName := IntegrationKit(ns, name)() + integrationKitNamespace := IntegrationKitNamespace(ns, name)() // Check containers conditions - Eventually(Build(operatorNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil()) - Eventually(BuildConditions(operatorNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil()) + Eventually(Build(integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil()) + Eventually(BuildConditions(integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil()) Eventually( - Build(operatorNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status, + Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Status, TestTimeoutShort).Should(Equal(corev1.ConditionFalse)) Eventually( - Build(operatorNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message, + Build(integrationKitNamespace, integrationKitName)().Status.GetCondition(v1.BuildConditionType("Container custom1 succeeded")).Message, TestTimeoutShort).Should(ContainSubstring("No such file or directory")) Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed()) diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go index ae93dff57..26a48e2a9 100644 --- a/e2e/support/test_support.go +++ b/e2e/support/test_support.go @@ -1013,6 +1013,19 @@ func IntegrationKit(ns string, name string) func() string { } } +func IntegrationKitNamespace(integrationNamespace string, name string) func() string { + return func() string { + it := Integration(integrationNamespace, name)() + if it == nil { + return "" + } + if it.Status.IntegrationKit == nil { + return "" + } + return it.Status.IntegrationKit.Namespace + } +} + func Kit(ns, name string) func() *v1.IntegrationKit { return func() *v1.IntegrationKit { kit := v1.NewIntegrationKit(ns, name)