This is an automated email from the ASF dual-hosted git repository. squakez pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1fae3ed772e480d97189d4e1d6241cb85a8ae108 Author: Pasquale Congiusti <[email protected]> AuthorDate: Thu May 14 13:42:45 2026 +0200 fix(e2e): misleading func name --- e2e/advanced/build_order_strategy_test.go | 28 ++++++++++++++-------------- e2e/advanced/builder_test.go | 4 ++-- e2e/advanced/catalog_builder_test.go | 8 ++++---- e2e/advanced/incremental_build_test.go | 24 ++++++++++++------------ e2e/advanced/integration_profile_test.go | 4 ++-- e2e/advanced/operator_id_filtering_test.go | 2 +- e2e/advanced/operator_restart_test.go | 6 +++--- e2e/advanced/reset_test.go | 6 +++--- e2e/common/cli/promote_test.go | 2 +- e2e/common/config/config_test.go | 2 +- e2e/common/misc/integration_fail_test.go | 18 +++++++++--------- e2e/common/traits/builder_test.go | 14 +++++++------- e2e/common/traits/camel_test.go | 4 ++-- e2e/install/upgrade/upgrade_test.go | 2 +- e2e/native/native_test.go | 2 +- e2e/native/native_with_sources_test.go | 4 ++-- e2e/support/test_support.go | 8 +++++--- 17 files changed, 70 insertions(+), 68 deletions(-) diff --git a/e2e/advanced/build_order_strategy_test.go b/e2e/advanced/build_order_strategy_test.go index 796a65106..401d08bbe 100644 --- a/e2e/advanced/build_order_strategy_test.go +++ b/e2e/advanced/build_order_strategy_test.go @@ -52,8 +52,8 @@ func TestRunBuildOrderStrategyMatchingDependencies(t *testing.T) { integrationA := RandomizedSuffixName("java-a") g.Expect(KamelRun(t, ctx, ns, "files/Java.java", "--name", integrationA).Execute()).To(Succeed()) - g.Eventually(IntegrationKit(t, ctx, ns, integrationA), TestTimeoutMedium).ShouldNot(BeEmpty()) - integrationKitNameA := IntegrationKit(t, ctx, ns, integrationA)() + g.Eventually(IntegrationKitName(t, ctx, ns, integrationA), TestTimeoutMedium).ShouldNot(BeEmpty()) + integrationKitNameA := IntegrationKitName(t, ctx, ns, integrationA)() g.Eventually(Build(t, ctx, ns, integrationKitNameA), TestTimeoutMedium).ShouldNot(BeNil()) integrationB := RandomizedSuffixName("java-b") @@ -65,13 +65,13 @@ func TestRunBuildOrderStrategyMatchingDependencies(t *testing.T) { integrationZ := RandomizedSuffixName("yaml-z") g.Expect(KamelRun(t, ctx, ns, "files/timer-source.yaml", "--name", integrationZ).Execute()).To(Succeed()) - g.Eventually(IntegrationKit(t, ctx, ns, integrationB), TestTimeoutMedium).ShouldNot(BeEmpty()) - g.Eventually(IntegrationKit(t, ctx, ns, integrationC), TestTimeoutMedium).ShouldNot(BeEmpty()) - g.Eventually(IntegrationKit(t, ctx, ns, integrationZ), TestTimeoutMedium).ShouldNot(BeEmpty()) + g.Eventually(IntegrationKitName(t, ctx, ns, integrationB), TestTimeoutMedium).ShouldNot(BeEmpty()) + g.Eventually(IntegrationKitName(t, ctx, ns, integrationC), TestTimeoutMedium).ShouldNot(BeEmpty()) + g.Eventually(IntegrationKitName(t, ctx, ns, integrationZ), TestTimeoutMedium).ShouldNot(BeEmpty()) - integrationKitNameB := IntegrationKit(t, ctx, ns, integrationB)() - integrationKitNameC := IntegrationKit(t, ctx, ns, integrationC)() - integrationKitNameZ := IntegrationKit(t, ctx, ns, integrationZ)() + integrationKitNameB := IntegrationKitName(t, ctx, ns, integrationB)() + integrationKitNameC := IntegrationKitName(t, ctx, ns, integrationC)() + integrationKitNameZ := IntegrationKitName(t, ctx, ns, integrationZ)() g.Eventually(BuildPhase(t, ctx, ns, integrationKitNameA), TestTimeoutLong).Should(Equal(v1.BuildPhaseSucceeded)) g.Eventually(IntegrationPodPhase(t, ctx, ns, integrationA), TestTimeoutLong).Should(Equal(corev1.PodRunning)) @@ -139,21 +139,21 @@ func TestRunBuildOrderStrategyFIFO(t *testing.T) { "--name", integrationZ, ).Execute()).To(Succeed()) - g.Eventually(IntegrationKit(t, ctx, ns, integrationA)).ShouldNot(BeNil()) - g.Eventually(IntegrationKit(t, ctx, ns, integrationB)).ShouldNot(BeNil()) - g.Eventually(IntegrationKit(t, ctx, ns, integrationZ)).ShouldNot(BeNil()) + g.Eventually(IntegrationKitName(t, ctx, ns, integrationA)).ShouldNot(BeEmpty()) + g.Eventually(IntegrationKitName(t, ctx, ns, integrationB)).ShouldNot(BeEmpty()) + g.Eventually(IntegrationKitName(t, ctx, ns, integrationZ)).ShouldNot(BeEmpty()) - integrationKitNameA := IntegrationKit(t, ctx, ns, integrationA)() + integrationKitNameA := IntegrationKitName(t, ctx, ns, integrationA)() g.Eventually(Build(t, ctx, ns, integrationKitNameA)).ShouldNot(BeNil()) g.Eventually(BuildPhase(t, ctx, ns, integrationKitNameA), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning)) g.Eventually(IntegrationPhase(t, ctx, ns, integrationB)).Should(Equal(v1.IntegrationPhaseBuildingKit)) - integrationKitNameB := IntegrationKit(t, ctx, ns, integrationB)() + integrationKitNameB := IntegrationKitName(t, ctx, ns, integrationB)() g.Eventually(Build(t, ctx, ns, integrationKitNameB)).ShouldNot(BeNil()) g.Eventually(BuildPhase(t, ctx, ns, integrationKitNameB), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning)) g.Eventually(IntegrationPhase(t, ctx, ns, integrationZ)).Should(Equal(v1.IntegrationPhaseBuildingKit)) - integrationKitNameZ := IntegrationKit(t, ctx, ns, integrationZ)() + integrationKitNameZ := IntegrationKitName(t, ctx, ns, integrationZ)() g.Eventually(Build(t, ctx, ns, integrationKitNameZ)).ShouldNot(BeNil()) g.Eventually(BuildPhase(t, ctx, ns, integrationKitNameZ), TestTimeoutShort).Should(Equal(v1.BuildPhaseRunning)) diff --git a/e2e/advanced/builder_test.go b/e2e/advanced/builder_test.go index 3b33c58ad..4b29faaab 100644 --- a/e2e/advanced/builder_test.go +++ b/e2e/advanced/builder_test.go @@ -64,7 +64,7 @@ func TestBuilderTimeout(t *testing.T) { g.Expect(KamelRun(t, ctx, ns, "files/yaml.yaml", "--name", name, "-t", "builder.strategy=pod").Execute()).To(Succeed()) // As the build hits timeout, it keeps trying building g.Eventually(IntegrationPhase(t, ctx, ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit)) - integrationKitName := IntegrationKit(t, ctx, ns, name)() + integrationKitName := IntegrationKitName(t, ctx, ns, name)() builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName) g.Eventually(BuilderPodPhase(t, ctx, ns, builderKitName)).Should(Equal(corev1.PodPending)) g.Eventually(BuildPhase(t, ctx, ns, integrationKitName)).Should(Equal(v1.BuildPhaseRunning)) @@ -98,7 +98,7 @@ func TestMavenProfile(t *testing.T) { g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationKitName := IntegrationKit(t, ctx, ns, name)() + integrationKitName := IntegrationKitName(t, ctx, ns, name)() integrationKitNamespace := IntegrationKitNamespace(t, ctx, ns, name)() builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName) g.Eventually(BuilderPod(t, ctx, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil()) diff --git a/e2e/advanced/catalog_builder_test.go b/e2e/advanced/catalog_builder_test.go index 552b55b91..f38e02aa4 100644 --- a/e2e/advanced/catalog_builder_test.go +++ b/e2e/advanced/catalog_builder_test.go @@ -60,8 +60,8 @@ func TestCamelCatalogBuilder(t *testing.T) { g.Eventually(CamelCatalogPhase(t, ctx, ns, nonCompatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseError)) g.Eventually(CamelCatalogCondition(t, ctx, ns, nonCompatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(ContainSubstring("Container image tool missing in catalog")) - g.Eventually(IntegrationKit(t, ctx, ns, name)).ShouldNot(Equal("")) - kitName := IntegrationKit(t, ctx, ns, name)() + g.Eventually(IntegrationKitName(t, ctx, ns, name)).ShouldNot(Equal("")) + kitName := IntegrationKitName(t, ctx, ns, name)() g.Eventually(KitPhase(t, ctx, ns, kitName)).Should(Equal(v1.IntegrationKitPhaseError)) g.Eventually(KitCondition(t, ctx, ns, kitName, v1.IntegrationKitConditionCatalogAvailable)().Reason).Should(Equal("Camel Catalog 1.15.0 error")) g.Eventually(IntegrationPhase(t, ctx, ns, name)).Should(Equal(v1.IntegrationPhaseError)) @@ -109,8 +109,8 @@ func TestCamelCatalogBuilder(t *testing.T) { Equal("Container image tool found in catalog"), ) - g.Eventually(IntegrationKit(t, ctx, ns, name)).ShouldNot(Equal("")) - kitName := IntegrationKit(t, ctx, ns, name)() + g.Eventually(IntegrationKitName(t, ctx, ns, name)).ShouldNot(Equal("")) + kitName := IntegrationKitName(t, ctx, ns, name)() g.Eventually(KitPhase(t, ctx, ns, kitName)).Should(Equal(v1.IntegrationKitPhaseReady)) g.Eventually(IntegrationPodPhase(t, ctx, ns, name)).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort). diff --git a/e2e/advanced/incremental_build_test.go b/e2e/advanced/incremental_build_test.go index c8e782bde..db117a029 100644 --- a/e2e/advanced/incremental_build_test.go +++ b/e2e/advanced/incremental_build_test.go @@ -47,7 +47,7 @@ func TestRunIncrementalBuildRoutine(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationKitName := IntegrationKit(t, ctx, ns, name)() + integrationKitName := IntegrationKitName(t, ctx, ns, name)() g.Eventually(Kit(t, ctx, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage())) g.Eventually(Kit(t, ctx, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage())) @@ -57,7 +57,7 @@ func TestRunIncrementalBuildRoutine(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationCloneKitName := IntegrationKit(t, ctx, ns, nameClone)() + integrationCloneKitName := IntegrationKitName(t, ctx, ns, nameClone)() g.Eventually(integrationCloneKitName).Should(Equal(integrationKitName)) }) @@ -69,7 +69,7 @@ func TestRunIncrementalBuildRoutine(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationIncrementalKitName := IntegrationKit(t, ctx, ns, nameIncremental)() + integrationIncrementalKitName := IntegrationKitName(t, ctx, ns, nameIncremental)() // the container comes in a format like // 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d // we should be saving just to check the substring is contained @@ -90,7 +90,7 @@ func TestRunIncrementalBuildPod(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationKitName := IntegrationKit(t, ctx, ns, name)() + integrationKitName := IntegrationKitName(t, ctx, ns, name)() g.Eventually(Kit(t, ctx, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage())) g.Eventually(Kit(t, ctx, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage())) g.Eventually(BuilderPodsCount(t, ctx, ns)).Should(Equal(1)) @@ -101,7 +101,7 @@ func TestRunIncrementalBuildPod(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationCloneKitName := IntegrationKit(t, ctx, ns, nameClone)() + integrationCloneKitName := IntegrationKitName(t, ctx, ns, nameClone)() g.Eventually(integrationCloneKitName).Should(Equal(integrationKitName)) g.Eventually(BuilderPodsCount(t, ctx, ns)).Should(Equal(1)) }) @@ -114,7 +114,7 @@ func TestRunIncrementalBuildPod(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationIncrementalKitName := IntegrationKit(t, ctx, ns, nameIncremental)() + integrationIncrementalKitName := IntegrationKitName(t, ctx, ns, nameIncremental)() // the container comes in a format like // 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d // we should be saving just to check the substring is contained @@ -136,7 +136,7 @@ func TestRunIncrementalBuildOff(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationKitName := IntegrationKit(t, ctx, ns, name)() + integrationKitName := IntegrationKitName(t, ctx, ns, name)() g.Eventually(Kit(t, ctx, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage())) t.Run("Don't reuse previous kit", func(t *testing.T) { @@ -145,7 +145,7 @@ func TestRunIncrementalBuildOff(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, nameClone), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, nameClone, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, nameClone), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationCloneKitName := IntegrationKit(t, ctx, ns, nameClone)() + integrationCloneKitName := IntegrationKitName(t, ctx, ns, nameClone)() g.Eventually(Kit(t, ctx, ns, integrationCloneKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage())) }) @@ -157,7 +157,7 @@ func TestRunIncrementalBuildOff(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationIncrementalKitName := IntegrationKit(t, ctx, ns, nameIncremental)() + integrationIncrementalKitName := IntegrationKitName(t, ctx, ns, nameIncremental)() g.Eventually(Kit(t, ctx, ns, integrationIncrementalKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage())) }) }) @@ -174,7 +174,7 @@ func TestRunIncrementalBuildWithDifferentBaseImages(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationKitName := IntegrationKit(t, ctx, ns, name)() + integrationKitName := IntegrationKitName(t, ctx, ns, name)() g.Eventually(Kit(t, ctx, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage())) g.Eventually(Kit(t, ctx, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage())) @@ -186,7 +186,7 @@ func TestRunIncrementalBuildWithDifferentBaseImages(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, nameIncremental), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, nameIncremental, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, nameIncremental), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationIncrementalKitName := IntegrationKit(t, ctx, ns, nameIncremental)() + integrationIncrementalKitName := IntegrationKitName(t, ctx, ns, nameIncremental)() // the container comes in a format like // 10.108.177.66/test-d7cad110-bb1d-4e79-8a0e-ebd44f6fe5d4/camel-k-kit-c8357r4k5tp6fn1idm60@sha256:d49716f0429ad8b23a1b8d20a357d64b1aa42a67c1a2a534ebd4c54cd598a18d // we should be save just to check the substring is contained @@ -202,7 +202,7 @@ func TestRunIncrementalBuildWithDifferentBaseImages(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationKitName = IntegrationKit(t, ctx, ns, name)() + integrationKitName = IntegrationKitName(t, ctx, ns, name)() g.Eventually(Kit(t, ctx, ns, integrationKitName)().Status.BaseImage).Should(Equal(newBaseImage)) g.Eventually(Kit(t, ctx, ns, integrationKitName)().Status.RootImage).Should(Equal(newBaseImage)) }) diff --git a/e2e/advanced/integration_profile_test.go b/e2e/advanced/integration_profile_test.go index d8c83bad6..73a7ec32b 100644 --- a/e2e/advanced/integration_profile_test.go +++ b/e2e/advanced/integration_profile_test.go @@ -127,7 +127,7 @@ func TestIntegrationProfileInfluencesKit(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, "normal"), TestTimeoutMedium).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationLogs(t, ctx, ns, "normal"), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) // Verify that a new kit has been built based on the default base image - integrationKitName := IntegrationKit(t, ctx, ns, "normal")() + integrationKitName := IntegrationKitName(t, ctx, ns, "normal")() g.Eventually(Kit(t, ctx, ns, integrationKitName)().Status.BaseImage).Should(Equal(defaults.BaseImage())) g.Eventually(Kit(t, ctx, ns, integrationKitName)().Status.RootImage).Should(Equal(defaults.BaseImage())) @@ -139,7 +139,7 @@ func TestIntegrationProfileInfluencesKit(t *testing.T) { g.Eventually(IntegrationLogs(t, ctx, ns, "simple"), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) // Verify that a new kit has been built based on the previous kit - integrationKitNameWithProfile := IntegrationKit(t, ctx, ns, "simple")() + integrationKitNameWithProfile := IntegrationKitName(t, ctx, ns, "simple")() g.Eventually(integrationKitNameWithProfile).ShouldNot(Equal(integrationKitName)) g.Eventually(Kit(t, ctx, ns, integrationKitNameWithProfile)().Status.BaseImage).Should(ContainSubstring(integrationKitName)) g.Eventually(Kit(t, ctx, ns, integrationKitNameWithProfile)().Status.RootImage).Should(Equal(defaults.BaseImage())) diff --git a/e2e/advanced/operator_id_filtering_test.go b/e2e/advanced/operator_id_filtering_test.go index 05f6d0e45..c9f5869db 100644 --- a/e2e/advanced/operator_id_filtering_test.go +++ b/e2e/advanced/operator_id_filtering_test.go @@ -80,7 +80,7 @@ func TestOperatorIDFiltering(t *testing.T) { }) t.Run("Operators can run scoped integrations with fixed image", func(t *testing.T) { - kitName := IntegrationKit(t, ctx, ns, "moving")() + kitName := IntegrationKitName(t, ctx, ns, "moving")() g.Expect(kitName).NotTo(BeEmpty()) kitImage := KitImage(t, ctx, nsop2, kitName)() g.Expect(kitImage).NotTo(BeEmpty()) diff --git a/e2e/advanced/operator_restart_test.go b/e2e/advanced/operator_restart_test.go index a2e0368fe..007f06ebb 100644 --- a/e2e/advanced/operator_restart_test.go +++ b/e2e/advanced/operator_restart_test.go @@ -49,7 +49,7 @@ func TestOperatorRestart(t *testing.T) { g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - g.Eventually(Kit(t, ctx, ns, IntegrationKit(t, ctx, ns, name)())).Should(Not(BeNil())) + g.Eventually(Kit(t, ctx, ns, IntegrationKitName(t, ctx, ns, name)())).Should(Not(BeNil())) g.Eventually(Integration(t, ctx, ns, name)).Should(Not(BeNil())) }) @@ -61,7 +61,7 @@ func TestOperatorRestart(t *testing.T) { g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - g.Eventually(Kit(t, ctx, ns, IntegrationKit(t, ctx, ns, name)())).Should(Not(BeNil())) + g.Eventually(Kit(t, ctx, ns, IntegrationKitName(t, ctx, ns, name)())).Should(Not(BeNil())) g.Eventually(Integration(t, ctx, ns, name)).Should(Not(BeNil())) }) @@ -79,7 +79,7 @@ func TestOperatorRestart(t *testing.T) { g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - g.Eventually(Kit(t, ctx, ns, IntegrationKit(t, ctx, ns, name)())).Should(Not(BeNil())) + g.Eventually(Kit(t, ctx, ns, IntegrationKitName(t, ctx, ns, name)())).Should(Not(BeNil())) g.Eventually(Integration(t, ctx, ns, name)).Should(Not(BeNil())) }) }) diff --git a/e2e/advanced/reset_test.go b/e2e/advanced/reset_test.go index 5d20474d3..f945abc58 100644 --- a/e2e/advanced/reset_test.go +++ b/e2e/advanced/reset_test.go @@ -43,7 +43,7 @@ func TestKamelReset(t *testing.T) { g.Expect(KamelRun(t, ctx, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed()) g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - g.Eventually(Kit(t, ctx, ns, IntegrationKit(t, ctx, ns, name)())).Should(Not(BeNil())) + g.Eventually(Kit(t, ctx, ns, IntegrationKitName(t, ctx, ns, name)())).Should(Not(BeNil())) g.Eventually(Integration(t, ctx, ns, name)).Should(Not(BeNil())) g.Expect(Kamel(t, ctx, "reset", "-n", ns, "--force").Execute()).To(Succeed()) @@ -56,7 +56,7 @@ func TestKamelReset(t *testing.T) { g.Expect(KamelRun(t, ctx, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed()) g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - g.Eventually(Kit(t, ctx, ns, IntegrationKit(t, ctx, ns, name)())).Should(Not(BeNil())) + g.Eventually(Kit(t, ctx, ns, IntegrationKitName(t, ctx, ns, name)())).Should(Not(BeNil())) g.Eventually(Integration(t, ctx, ns, name)).Should(Not(BeNil())) g.Expect(Kamel(t, ctx, "reset", "-n", ns, "--skip-integrations", "--force").Execute()).To(Succeed()) @@ -69,7 +69,7 @@ func TestKamelReset(t *testing.T) { g.Expect(KamelRun(t, ctx, ns, "files/yaml.yaml", "--name", name).Execute()).To(Succeed()) g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutMedium).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - kitName := IntegrationKit(t, ctx, ns, name)() + kitName := IntegrationKitName(t, ctx, ns, name)() g.Eventually(Kit(t, ctx, ns, kitName)).Should(Not(BeNil())) g.Eventually(Integration(t, ctx, ns, name)).Should(Not(BeNil())) diff --git a/e2e/common/cli/promote_test.go b/e2e/common/cli/promote_test.go index f4ac12cb6..9b2276ff7 100644 --- a/e2e/common/cli/promote_test.go +++ b/e2e/common/cli/promote_test.go @@ -55,7 +55,7 @@ func TestKamelPromoteGitOps(t *testing.T) { Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, nsTarget, "yaml"), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) // Make sure that no IntegrationKit was ever built for this Integration - g.Eventually(IntegrationKit(t, ctx, nsTarget, "yaml")).Should(Equal("")) + g.Eventually(IntegrationKitName(t, ctx, nsTarget, "yaml")).Should(Equal("")) }) }) } diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go index 49a67351c..ef4f07ca9 100644 --- a/e2e/common/config/config_test.go +++ b/e2e/common/config/config_test.go @@ -226,7 +226,7 @@ func TestRunConfigBuildProperties(t *testing.T) { g.Eventually(IntegrationConditionStatus(t, ctx, ns, "build-property-route-updated", v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, "build-property-route-updated"), TestTimeoutShort).Should(ContainSubstring("my-super-application-updated")) // Verify the integration kits are different - g.Eventually(IntegrationKit(t, ctx, ns, "build-property-route-updated")).ShouldNot(Equal(IntegrationKit(t, ctx, ns, "build-property-route")())) + g.Eventually(IntegrationKitName(t, ctx, ns, "build-property-route-updated")).ShouldNot(Equal(IntegrationKitName(t, ctx, ns, "build-property-route")())) }) // Build-Properties file diff --git a/e2e/common/misc/integration_fail_test.go b/e2e/common/misc/integration_fail_test.go index c7e84e4fa..2fd9b9b85 100644 --- a/e2e/common/misc/integration_fail_test.go +++ b/e2e/common/misc/integration_fail_test.go @@ -57,7 +57,7 @@ func TestBadRouteIntegration(t *testing.T) { g.Eventually(IntegrationPhase(t, ctx, ns, name), TestTimeoutShort).Should(Equal(v1.IntegrationPhaseError)) // Kit valid - kitName := IntegrationKit(t, ctx, ns, name)() + kitName := IntegrationKitName(t, ctx, ns, name)() integrationKitNamespace := IntegrationKitNamespace(t, ctx, ns, name)() g.Eventually(KitPhase(t, ctx, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady)) }) @@ -74,7 +74,7 @@ func TestBadRouteIntegration(t *testing.T) { g.Eventually(IntegrationCondition(t, ctx, ns, name, v1.IntegrationConditionKitAvailable), TestTimeoutShort).Should( WithTransform(IntegrationConditionMessage, ContainSubstring("is in state \"Error\""))) // Kit in error - kitName := IntegrationKit(t, ctx, ns, name)() + kitName := IntegrationKitName(t, ctx, ns, name)() integrationKitNamespace := IntegrationKitNamespace(t, ctx, ns, name)() g.Eventually(KitPhase(t, ctx, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseError)) //Build in error with 5 attempts @@ -85,7 +85,7 @@ func TestBadRouteIntegration(t *testing.T) { g.Expect(KamelRun(t, ctx, ns, "files/Java.java", "--name", name).Execute()).To(Succeed()) g.Eventually(IntegrationPhase(t, ctx, ns, name), TestTimeoutLong).Should(Equal(v1.IntegrationPhaseRunning)) // New Kit success - kitRecoveryName := IntegrationKit(t, ctx, ns, name)() + kitRecoveryName := IntegrationKitName(t, ctx, ns, name)() integrationKitRecoveryNamespace := IntegrationKitNamespace(t, ctx, ns, name)() g.Eventually(KitPhase(t, ctx, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady)) g.Expect(kitRecoveryName).NotTo(Equal(kitName)) @@ -106,7 +106,7 @@ func TestBadRouteIntegration(t *testing.T) { WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")), )) // Kit shouldn't be created - g.Consistently(IntegrationKit(t, ctx, ns, name), 10*time.Second).Should(BeEmpty()) + g.Consistently(IntegrationKitName(t, ctx, ns, name), 10*time.Second).Should(BeEmpty()) // Fixing the route should reconcile the Integration in Initialization Failed condition to Running g.Expect(KamelRun(t, ctx, ns, "files/Java.java", "--name", name).Execute()).To(Succeed()) @@ -115,7 +115,7 @@ func TestBadRouteIntegration(t *testing.T) { Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) // New Kit success - kitRecoveryName := IntegrationKit(t, ctx, ns, name)() + kitRecoveryName := IntegrationKitName(t, ctx, ns, name)() integrationKitRecoveryNamespace := IntegrationKitNamespace(t, ctx, ns, name)() g.Eventually(KitPhase(t, ctx, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady)) // New Build success @@ -134,7 +134,7 @@ func TestBadRouteIntegration(t *testing.T) { WithTransform(IntegrationConditionMessage, HavePrefix("error during trait customization")), )) // Kit shouldn't be created - g.Consistently(IntegrationKit(t, ctx, ns, name), 10*time.Second).Should(BeEmpty()) + g.Consistently(IntegrationKitName(t, ctx, ns, name), 10*time.Second).Should(BeEmpty()) // Fixing the route should reconcile the Integration in Initialization Failed condition to Running g.Expect(KamelRun(t, ctx, ns, "files/Java.java", "--name", name, "-t", "health.enabled=false").Execute()).To(Succeed()) @@ -143,7 +143,7 @@ func TestBadRouteIntegration(t *testing.T) { Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) // New Kit success - kitRecoveryName := IntegrationKit(t, ctx, ns, name)() + kitRecoveryName := IntegrationKitName(t, ctx, ns, name)() integrationKitRecoveryNamespace := IntegrationKitNamespace(t, ctx, ns, name)() g.Eventually(KitPhase(t, ctx, integrationKitRecoveryNamespace, kitRecoveryName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady)) // New Build success @@ -161,7 +161,7 @@ func TestBadRouteIntegration(t *testing.T) { g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Compilation error")) // Kit valid - kitName := IntegrationKit(t, ctx, ns, name)() + kitName := IntegrationKitName(t, ctx, ns, name)() integrationKitNamespace := IntegrationKitNamespace(t, ctx, ns, name)() g.Eventually(KitPhase(t, ctx, integrationKitNamespace, kitName), TestTimeoutShort).Should(Equal(v1.IntegrationKitPhaseReady)) @@ -173,7 +173,7 @@ func TestBadRouteIntegration(t *testing.T) { g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) // Kit should not have changed - kitRecoveryName := IntegrationKit(t, ctx, ns, name)() + kitRecoveryName := IntegrationKitName(t, ctx, ns, name)() g.Expect(kitRecoveryName).To(Equal(kitName)) }) diff --git a/e2e/common/traits/builder_test.go b/e2e/common/traits/builder_test.go index 9377af043..cd678d00f 100644 --- a/e2e/common/traits/builder_test.go +++ b/e2e/common/traits/builder_test.go @@ -50,7 +50,7 @@ func TestBuilderTrait(t *testing.T) { g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationKitName := IntegrationKit(t, ctx, ns, name)() + integrationKitName := IntegrationKitName(t, ctx, ns, name)() integrationKitNamespace := IntegrationKitNamespace(t, ctx, ns, name)() builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName) g.Eventually(BuildConfig(t, ctx, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine)) @@ -77,7 +77,7 @@ func TestBuilderTrait(t *testing.T) { g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationKitName := IntegrationKit(t, ctx, ns, name)() + integrationKitName := IntegrationKitName(t, ctx, ns, name)() integrationKitNamespace := IntegrationKitNamespace(t, ctx, ns, name)() builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName) g.Eventually(BuildConfig(t, ctx, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine)) @@ -102,7 +102,7 @@ func TestBuilderTrait(t *testing.T) { g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationKitName := IntegrationKit(t, ctx, ns, name)() + integrationKitName := IntegrationKitName(t, ctx, ns, name)() integrationKitNamespace := IntegrationKitNamespace(t, ctx, ns, name)() builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName) g.Eventually(BuildConfig(t, ctx, integrationKitNamespace, integrationKitName)().Strategy, TestTimeoutShort).Should(Equal(v1.BuildStrategyRoutine)) @@ -133,7 +133,7 @@ func TestBuilderTrait(t *testing.T) { g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationKitName := IntegrationKit(t, ctx, ns, name)() + integrationKitName := IntegrationKitName(t, ctx, ns, name)() integrationKitNamespace := IntegrationKitNamespace(t, ctx, ns, name)() builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName) @@ -164,7 +164,7 @@ func TestBuilderTrait(t *testing.T) { g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutLong).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationKitName := IntegrationKit(t, ctx, ns, name)() + integrationKitName := IntegrationKitName(t, ctx, ns, name)() integrationKitNamespace := IntegrationKitNamespace(t, ctx, ns, name)() builderKitName := fmt.Sprintf("camel-k-%s-builder", integrationKitName) g.Eventually(BuilderPod(t, ctx, integrationKitNamespace, builderKitName), TestTimeoutShort).ShouldNot(BeNil()) @@ -204,7 +204,7 @@ func TestBuilderTrait(t *testing.T) { g.Expect(KamelRun(t, ctx, ns, "files/Java.java", "--name", name, "-t", "builder.tasks=custom1;alpine;cat missingfile.txt", "-t", "builder.strategy=pod").Execute()).To(Succeed()) g.Eventually(IntegrationPhase(t, ctx, ns, name)).Should(Equal(v1.IntegrationPhaseBuildingKit)) - integrationKitName := IntegrationKit(t, ctx, ns, name)() + integrationKitName := IntegrationKitName(t, ctx, ns, name)() integrationKitNamespace := IntegrationKitNamespace(t, ctx, ns, name)() // Check containers conditions g.Eventually(Build(t, ctx, integrationKitNamespace, integrationKitName), TestTimeoutLong).ShouldNot(BeNil()) @@ -225,7 +225,7 @@ func TestBuilderTrait(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationKitName := IntegrationKit(t, ctx, ns, name)() + integrationKitName := IntegrationKitName(t, ctx, ns, name)() integrationKitNamespace := IntegrationKitNamespace(t, ctx, ns, name)() g.Eventually(KitRootImage(t, ctx, integrationKitNamespace, integrationKitName), TestTimeoutShort).Should(Equal("gcr.io/distroless/java17-debian12")) }) diff --git a/e2e/common/traits/camel_test.go b/e2e/common/traits/camel_test.go index ed82d71ef..37664de10 100644 --- a/e2e/common/traits/camel_test.go +++ b/e2e/common/traits/camel_test.go @@ -45,13 +45,13 @@ func TestCamelTrait(t *testing.T) { g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutLong).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - integrationKit := IntegrationKit(t, ctx, ns, name)() + integrationKit := IntegrationKitName(t, ctx, ns, name)() g.Expect(KamelRun(t, ctx, ns, "files/Java.java", "--name", name, "-p", "a=1").Execute()).To(Succeed()) g.Eventually(IntegrationPodPhase(t, ctx, ns, name), TestTimeoutShort).Should(Equal(corev1.PodRunning)) g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!")) - g.Eventually(IntegrationKit(t, ctx, ns, name)).Should(Equal(integrationKit)) + g.Eventually(IntegrationKitName(t, ctx, ns, name)).Should(Equal(integrationKit)) }) }) } diff --git a/e2e/install/upgrade/upgrade_test.go b/e2e/install/upgrade/upgrade_test.go index fe4ff1cab..2c9d71ac2 100644 --- a/e2e/install/upgrade/upgrade_test.go +++ b/e2e/install/upgrade/upgrade_test.go @@ -147,7 +147,7 @@ func TestUpgrade(t *testing.T) { kit := Kits(t, ctx, ns, KitWithRuntimeVersion(defaults.DefaultRuntimeVersion))()[0] // Check the Integration uses the new image - g.Eventually(IntegrationKit(t, ctx, nsIntegration, name), TestTimeoutMedium).Should(Equal(kit.Name)) + g.Eventually(IntegrationKitName(t, ctx, nsIntegration, name), TestTimeoutMedium).Should(Equal(kit.Name)) // Check the Integration Pod uses the new kit g.Eventually(IntegrationPodImage(t, ctx, nsIntegration, name)).Should(Equal(kit.Status.Image)) diff --git a/e2e/native/native_test.go b/e2e/native/native_test.go index a13fdfd8f..ebc014fd5 100644 --- a/e2e/native/native_test.go +++ b/e2e/native/native_test.go @@ -88,7 +88,7 @@ func TestNativeIntegrations(t *testing.T) { g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort). Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Magicstring!2")) - g.Eventually(IntegrationKit(t, ctx, ns, "yaml-native-2")).Should(Equal(IntegrationKit(t, ctx, ns, "yaml-native")())) + g.Eventually(IntegrationKitName(t, ctx, ns, "yaml-native-2")).Should(Equal(IntegrationKitName(t, ctx, ns, "yaml-native")())) }) }) diff --git a/e2e/native/native_with_sources_test.go b/e2e/native/native_with_sources_test.go index 6ceeb3cf9..a6baae5a8 100644 --- a/e2e/native/native_with_sources_test.go +++ b/e2e/native/native_with_sources_test.go @@ -61,7 +61,7 @@ func TestNativeHighMemoryIntegrations(t *testing.T) { g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort). Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Java Magicstring!")) - g.Eventually(IntegrationKit(t, ctx, ns, javaNativeCloneName)).Should(Equal(IntegrationKit(t, ctx, ns, javaNativeName)())) + g.Eventually(IntegrationKitName(t, ctx, ns, javaNativeCloneName)).Should(Equal(IntegrationKitName(t, ctx, ns, javaNativeName)())) }) t.Run("java native should rebuild", func(t *testing.T) { @@ -74,7 +74,7 @@ func TestNativeHighMemoryIntegrations(t *testing.T) { g.Eventually(IntegrationConditionStatus(t, ctx, ns, name, v1.IntegrationConditionReady), TestTimeoutShort). Should(Equal(corev1.ConditionTrue)) g.Eventually(IntegrationLogs(t, ctx, ns, name), TestTimeoutShort).Should(ContainSubstring("Java Magic2string!")) - g.Eventually(IntegrationKit(t, ctx, ns, javaNative2Name)).ShouldNot(Equal(IntegrationKit(t, ctx, ns, javaNativeName)())) + g.Eventually(IntegrationKitName(t, ctx, ns, javaNative2Name)).ShouldNot(Equal(IntegrationKitName(t, ctx, ns, javaNativeName)())) }) }) diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go index 70a9e36fd..f446bed16 100644 --- a/e2e/support/test_support.go +++ b/e2e/support/test_support.go @@ -1072,7 +1072,7 @@ func IntegrationSpecSA(t *testing.T, ctx context.Context, ns string, name string } } -func IntegrationKit(t *testing.T, ctx context.Context, ns string, name string) func() string { +func IntegrationKitName(t *testing.T, ctx context.Context, ns string, name string) func() string { return func() string { it := Integration(t, ctx, ns, name)() if it == nil { @@ -1879,10 +1879,12 @@ func Build(t *testing.T, ctx context.Context, ns, name string) func() *v1.Build build := v1.NewBuild(ns, name) if err := TestClient(t).Get(ctx, ctrl.ObjectKeyFromObject(build), build); err != nil && k8serrors.IsNotFound(err) { return nil - } else if err != nil { - log.Error(err, "Error while retrieving build "+name) + } else if err != nil && k8serrors.IsNotFound(err) && k8serrors.IsNotFound(err) { return nil + } else { + log.Error(err, "Error while retrieving build "+name) } + return build } }
