You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cd...@apache.org on 2024/03/08 19:36:01 UTC
(camel-k) 08/10: chore(e2e): Synchronize kamel install command in e2e tests
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e0803311e132d3393c77a926ac9042479c6aed2f
Author: Christoph Deppisch <cd...@redhat.com>
AuthorDate: Tue Mar 5 19:29:37 2024 +0100
chore(e2e): Synchronize kamel install command in e2e tests
---
e2e/advanced/build_order_strategy_test.go | 2 +-
e2e/advanced/builder_test.go | 2 +-
e2e/advanced/catalog_builder_test.go | 2 +-
e2e/advanced/debug_test.go | 2 +-
e2e/advanced/deployment_test.go | 2 +-
e2e/advanced/dump_test.go | 2 +-
e2e/advanced/environment_test.go | 2 +-
e2e/advanced/incremental_build_test.go | 8 +-
e2e/advanced/integration_profile_test.go | 6 +-
e2e/advanced/kamelet_repo_test.go | 2 +-
e2e/advanced/local_platform_test.go | 4 +-
e2e/advanced/maven_http_proxy_test.go | 4 +-
e2e/advanced/operator_id_filtering_test.go | 6 +-
e2e/advanced/operator_metrics_test.go | 2 +-
e2e/advanced/platform_traits_test.go | 2 +-
e2e/advanced/promote_test.go | 4 +-
e2e/advanced/reset_test.go | 2 +-
e2e/advanced/synthetic_test.go | 4 +-
e2e/builder/build_test.go | 2 +-
e2e/builder/registry_test.go | 6 +-
e2e/common/cli/main_test.go | 2 +-
e2e/common/cli/run_test.go | 4 +-
e2e/common/config/config_reload_test.go | 8 +-
e2e/common/config/config_test.go | 2 +-
e2e/common/config/kamelet_config_test.go | 194 +++--------------------
e2e/common/config/pipe_config_test.go | 2 +-
e2e/common/languages/groovy_test.go | 2 +-
e2e/common/languages/java_test.go | 2 +-
e2e/common/languages/js_test.go | 2 +-
e2e/common/languages/kotlin_test.go | 2 +-
e2e/common/languages/polyglot_test.go | 2 +-
e2e/common/languages/xml_test.go | 2 +-
e2e/common/languages/yaml_test.go | 2 +-
e2e/common/misc/cron_test.go | 2 +-
e2e/common/misc/integration_fail_test.go | 2 +-
e2e/common/misc/integration_trait_update_test.go | 2 +-
e2e/common/misc/kamelet_test.go | 2 +-
e2e/common/misc/kamelet_update_test.go | 2 +-
e2e/common/misc/maven_repository_test.go | 2 +-
e2e/common/misc/pipe_test.go | 2 +-
e2e/common/misc/pipe_with_image_test.go | 2 +-
e2e/common/misc/registry_maven_wagon_test.go | 2 +-
e2e/common/misc/rest_test.go | 2 +-
e2e/common/misc/scale_binding_test.go | 2 +-
e2e/common/misc/scale_integration_test.go | 2 +-
e2e/common/misc/structured_logs_test.go | 2 +-
e2e/common/runtimes/runtimes_test.go | 2 +-
e2e/common/traits/affinity_test.go | 2 +-
e2e/common/traits/builder_test.go | 2 +-
e2e/common/traits/camel_test.go | 2 +-
e2e/common/traits/container_test.go | 2 +-
e2e/common/traits/deployment_test.go | 4 +-
e2e/common/traits/error_handler_test.go | 2 +-
e2e/common/traits/errored_trait_test.go | 2 +-
e2e/common/traits/health_test.go | 2 +-
e2e/common/traits/istio_test.go | 2 +-
e2e/common/traits/jolokia_test.go | 2 +-
e2e/common/traits/jvm_test.go | 2 +-
e2e/common/traits/kamelet_test.go | 2 +-
e2e/common/traits/master_test.go | 2 +-
e2e/common/traits/openapi_test.go | 2 +-
e2e/common/traits/pdb_test.go | 2 +-
e2e/common/traits/pod_test.go | 2 +-
e2e/common/traits/prometheus_test.go | 2 +-
e2e/common/traits/pull_secret_test.go | 2 +-
e2e/common/traits/route_test.go | 2 +-
e2e/common/traits/service_binding_test.go | 2 +-
e2e/common/traits/service_test.go | 2 +-
e2e/common/traits/toleration_test.go | 2 +-
e2e/install/cli/global_kamelet_test.go | 6 +-
e2e/install/cli/global_test.go | 8 +-
e2e/install/cli/install_test.go | 16 +-
e2e/install/cli/maven_ca_secret_test.go | 2 +-
e2e/install/cli/uninstall_test.go | 16 +-
e2e/install/upgrade/cli_upgrade_test.go | 2 +-
e2e/knative/knative_platform_test.go | 2 +-
e2e/knative/knative_test.go | 2 +-
e2e/native/native_binding_test.go | 2 +-
e2e/native/native_test.go | 2 +-
e2e/native/native_with_sources_test.go | 2 +-
e2e/support/test_support.go | 15 +-
e2e/telemetry/telemetry_test.go | 2 +-
script/Makefile | 2 +-
83 files changed, 152 insertions(+), 293 deletions(-)
diff --git a/e2e/advanced/build_order_strategy_test.go b/e2e/advanced/build_order_strategy_test.go
index ad30b02e8..42ebe538b 100644
--- a/e2e/advanced/build_order_strategy_test.go
+++ b/e2e/advanced/build_order_strategy_test.go
@@ -43,7 +43,7 @@ func TestRunBuildOrderStrategyMatchingDependencies(t *testing.T) {
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
g.Expect(KamelInstallWithID(t, operatorID, ns,
"--max-running-pipelines", "4",
- "--build-order-strategy", string(v1.BuildOrderStrategyDependencies)).Execute()).To(Succeed())
+ "--build-order-strategy", string(v1.BuildOrderStrategyDependencies))).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Expect(CreateTimerKamelet(t, operatorID, ns, "timer-source")()).To(Succeed())
diff --git a/e2e/advanced/builder_test.go b/e2e/advanced/builder_test.go
index 2ab36f8c1..d18100be6 100644
--- a/e2e/advanced/builder_test.go
+++ b/e2e/advanced/builder_test.go
@@ -42,7 +42,7 @@ func TestBuilderTimeout(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
g.Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
diff --git a/e2e/advanced/catalog_builder_test.go b/e2e/advanced/catalog_builder_test.go
index 4279e7f75..cd8faa52b 100644
--- a/e2e/advanced/catalog_builder_test.go
+++ b/e2e/advanced/catalog_builder_test.go
@@ -42,7 +42,7 @@ func TestCamelCatalogBuilder(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
g.Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
diff --git a/e2e/advanced/debug_test.go b/e2e/advanced/debug_test.go
index 753d6b27c..1bee4ba18 100644
--- a/e2e/advanced/debug_test.go
+++ b/e2e/advanced/debug_test.go
@@ -43,7 +43,7 @@ func TestKamelCLIDebug(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/deployment_test.go b/e2e/advanced/deployment_test.go
index 91cefb686..3d58c6eb7 100644
--- a/e2e/advanced/deployment_test.go
+++ b/e2e/advanced/deployment_test.go
@@ -41,7 +41,7 @@ func TestDeploymentFailureShouldReportIntegrationCondition(t *testing.T) {
nsRestr := "restr"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force")).To(Succeed())
// Create restricted namespace
ExpectExecSucceed(t, g,
exec.Command(
diff --git a/e2e/advanced/dump_test.go b/e2e/advanced/dump_test.go
index 7791863d0..96c218af1 100644
--- a/e2e/advanced/dump_test.go
+++ b/e2e/advanced/dump_test.go
@@ -49,7 +49,7 @@ func TestKamelCLIDump(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Expect(KamelRunWithID(t, operatorID, ns, "files/yaml.yaml").Execute()).To(Succeed())
diff --git a/e2e/advanced/environment_test.go b/e2e/advanced/environment_test.go
index c17839ef9..bff92d269 100644
--- a/e2e/advanced/environment_test.go
+++ b/e2e/advanced/environment_test.go
@@ -72,7 +72,7 @@ func TestEnvironmentTrait(t *testing.T) {
g.Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", fmt.Sprintf("HTTP_PROXY=%s", httpProxy),
"--operator-env-vars", "NO_PROXY="+strings.Join(noProxy, ","),
- ).Execute()).To(Succeed())
+ )).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/incremental_build_test.go b/e2e/advanced/incremental_build_test.go
index 40db5479a..b34f6c84b 100644
--- a/e2e/advanced/incremental_build_test.go
+++ b/e2e/advanced/incremental_build_test.go
@@ -42,7 +42,7 @@ func TestRunIncrementalBuildRoutine(t *testing.T) {
operatorID := "camel-k-incremental-build-routine"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
@@ -97,7 +97,7 @@ func TestRunIncrementalBuildPod(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-incremental-build-pod"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
@@ -158,7 +158,7 @@ func TestRunIncrementalBuildOff(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-standard-build"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
@@ -210,7 +210,7 @@ func TestRunIncrementalBuildWithDifferentBaseImages(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-incremental-different-base"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
diff --git a/e2e/advanced/integration_profile_test.go b/e2e/advanced/integration_profile_test.go
index 849450f1d..422490ecd 100644
--- a/e2e/advanced/integration_profile_test.go
+++ b/e2e/advanced/integration_profile_test.go
@@ -40,7 +40,7 @@ func TestIntegrationProfile(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-integration-profile"
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "ipr-global")
@@ -128,7 +128,7 @@ func TestIntegrationProfileInfluencesKit(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-ipr-kit"
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "ipr-global")
@@ -173,7 +173,7 @@ func TestPropagateIntegrationProfileChanges(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-ipr-changes"
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
integrationProfile := v1.NewIntegrationProfile(ns, "debug-profile")
diff --git a/e2e/advanced/kamelet_repo_test.go b/e2e/advanced/kamelet_repo_test.go
index 4a77e16ed..fd9e3502b 100644
--- a/e2e/advanced/kamelet_repo_test.go
+++ b/e2e/advanced/kamelet_repo_test.go
@@ -40,7 +40,7 @@ func TestKameletFromCustomRepository(t *testing.T) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
kameletName := "timer-custom-source"
diff --git a/e2e/advanced/local_platform_test.go b/e2e/advanced/local_platform_test.go
index d6403862d..1b6923d91 100644
--- a/e2e/advanced/local_platform_test.go
+++ b/e2e/advanced/local_platform_test.go
@@ -40,7 +40,7 @@ func TestLocalPlatform(t *testing.T) {
operatorID := "camel-k-platform-local"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Expect(UpdatePlatform(t, ns, operatorID, func(pl *v1.IntegrationPlatform) {
@@ -56,7 +56,7 @@ func TestLocalPlatform(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns1 string) {
// Install platform (use the installer to get staging if present)
- g.Expect(KamelInstallWithID(t, "local-platform", ns1, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, "local-platform", ns1, "--skip-operator-setup")).To(Succeed())
g.Expect(UpdatePlatform(t, ns1, "local-platform", func(pl *v1.IntegrationPlatform) {
pl.Spec.Build.Maven.Properties = make(map[string]string)
diff --git a/e2e/advanced/maven_http_proxy_test.go b/e2e/advanced/maven_http_proxy_test.go
index a556377b6..b2e099673 100644
--- a/e2e/advanced/maven_http_proxy_test.go
+++ b/e2e/advanced/maven_http_proxy_test.go
@@ -181,7 +181,7 @@ func TestMavenProxy(t *testing.T) {
}()
// ENV values should be injected by the OLM
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
} else {
g.Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", fmt.Sprintf("HTTP_PROXY=http://%s", hostname),
@@ -189,7 +189,7 @@ func TestMavenProxy(t *testing.T) {
// "--operator-env-vars", fmt.Sprintf("HTTPS_PROXY=https://%s", hostname),
// "--maven-ca-secret", secret.Name+"/"+corev1.TLSCertKey,
"--operator-env-vars", "NO_PROXY="+strings.Join(noProxy, ","),
- ).Execute()).To(Succeed())
+ )).To(Succeed())
}
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/operator_id_filtering_test.go b/e2e/advanced/operator_id_filtering_test.go
index d7c316e4e..e73ea68c3 100644
--- a/e2e/advanced/operator_id_filtering_test.go
+++ b/e2e/advanced/operator_id_filtering_test.go
@@ -39,7 +39,7 @@ func TestOperatorIDCamelCatalogReconciliation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
})
@@ -53,14 +53,14 @@ func TestOperatorIDFiltering(t *testing.T) {
operator1 := "operator-1"
g.Expect(CopyCamelCatalog(t, nsop1, operator1)).To(Succeed())
g.Expect(CopyIntegrationKits(t, nsop1, operator1)).To(Succeed())
- g.Expect(KamelInstallWithIDAndKameletCatalog(t, operator1, nsop1, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operator1, nsop1, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, nsop1), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
WithNewTestNamespace(t, func(g *WithT, nsop2 string) {
operator2 := "operator-2"
g.Expect(CopyCamelCatalog(t, nsop2, operator2)).To(Succeed())
g.Expect(CopyIntegrationKits(t, nsop2, operator2)).To(Succeed())
- g.Expect(KamelInstallWithIDAndKameletCatalog(t, operator2, nsop2, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operator2, nsop2, "--global", "--force")).To(Succeed())
g.Eventually(PlatformPhase(t, nsop2), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("Operators ignore non-scoped integrations", func(t *testing.T) {
diff --git a/e2e/advanced/operator_metrics_test.go b/e2e/advanced/operator_metrics_test.go
index de59ed585..004ce2950 100644
--- a/e2e/advanced/operator_metrics_test.go
+++ b/e2e/advanced/operator_metrics_test.go
@@ -62,7 +62,7 @@ func TestMetrics(t *testing.T) {
name := RandomizedSuffixName("java")
operatorID := "camel-k-metrics"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--log-level", "debug").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--log-level", "debug")).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Expect(KamelRunWithID(t, operatorID, ns, "files/Java.java",
diff --git a/e2e/advanced/platform_traits_test.go b/e2e/advanced/platform_traits_test.go
index d62b32b46..a23c7603d 100644
--- a/e2e/advanced/platform_traits_test.go
+++ b/e2e/advanced/platform_traits_test.go
@@ -42,7 +42,7 @@ func TestTraitOnIntegrationPlatform(t *testing.T) {
operatorID := "camel-k-platform-trait-test"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
containerTestName := "testname"
diff --git a/e2e/advanced/promote_test.go b/e2e/advanced/promote_test.go
index 6327b0fc5..b03e1686e 100644
--- a/e2e/advanced/promote_test.go
+++ b/e2e/advanced/promote_test.go
@@ -43,7 +43,7 @@ func TestKamelCLIPromote(t *testing.T) {
operatorDevID := "camel-k-cli-promote-dev"
g.Expect(CopyCamelCatalog(t, nsDev, operatorDevID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, nsDev, operatorDevID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorDevID, nsDev).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorDevID, nsDev)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, nsDev, operatorDevID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Dev content configmap
@@ -86,7 +86,7 @@ func TestKamelCLIPromote(t *testing.T) {
operatorProdID := "camel-k-cli-promote-prod"
g.Expect(CopyCamelCatalog(t, nsProd, operatorProdID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, nsProd, operatorProdID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorProdID, nsProd).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorProdID, nsProd)).To(Succeed())
g.Eventually(PlatformPhase(t, nsProd), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("no configmap in destination", func(t *testing.T) {
diff --git a/e2e/advanced/reset_test.go b/e2e/advanced/reset_test.go
index 7e7a34504..6b0773dc8 100644
--- a/e2e/advanced/reset_test.go
+++ b/e2e/advanced/reset_test.go
@@ -39,7 +39,7 @@ func TestKamelReset(t *testing.T) {
operatorID := "camel-k-cli-reset"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/advanced/synthetic_test.go b/e2e/advanced/synthetic_test.go
index 5d8382984..f6282dd0a 100644
--- a/e2e/advanced/synthetic_test.go
+++ b/e2e/advanced/synthetic_test.go
@@ -42,7 +42,7 @@ func TestSyntheticIntegrationOff(t *testing.T) {
operatorID := "camel-k-synthetic-env-off"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
// Run the external deployment
@@ -68,7 +68,7 @@ func TestSyntheticIntegrationFromDeployment(t *testing.T) {
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
g.Expect(KamelInstallWithID(t, operatorID, ns,
"--operator-env-vars", "CAMEL_K_SYNTHETIC_INTEGRATIONS=true",
- ).Execute()).To(Succeed())
+ )).To(Succeed())
// Run the external deployment
ExpectExecSucceed(t, g, Kubectl("apply", "-f", "files/deploy.yaml", "-n", ns))
diff --git a/e2e/builder/build_test.go b/e2e/builder/build_test.go
index 33498a5d1..7aed010f9 100644
--- a/e2e/builder/build_test.go
+++ b/e2e/builder/build_test.go
@@ -403,7 +403,7 @@ func createOperator(t *testing.T, g *WithT, ns string, buildTimeout string, inst
args = append(args, installArgs...)
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, args...).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, args...)).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
}
diff --git a/e2e/builder/registry_test.go b/e2e/builder/registry_test.go
index e61b72dbc..653b94412 100644
--- a/e2e/builder/registry_test.go
+++ b/e2e/builder/registry_test.go
@@ -48,8 +48,7 @@ func TestRunWithDockerHubRegistry(t *testing.T) {
"--organization", user,
"--registry-auth-username", user,
"--registry-auth-password", pass,
- "--cluster-type", "kubernetes").
- Execute()).To(Succeed())
+ "--cluster-type", "kubernetes")).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
@@ -76,8 +75,7 @@ func TestRunWithGithubPackagesRegistry(t *testing.T) {
"--organization", repo,
"--registry-auth-username", user,
"--registry-auth-password", pass,
- "--cluster-type", "kubernetes").
- Execute()).To(Succeed())
+ "--cluster-type", "kubernetes")).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns, "files/groovy.groovy").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ns, "groovy"), TestTimeoutLong).Should(Equal(v1.PodRunning))
diff --git a/e2e/common/cli/main_test.go b/e2e/common/cli/main_test.go
index fa9e31452..c4dfbe1fa 100644
--- a/e2e/common/cli/main_test.go
+++ b/e2e/common/cli/main_test.go
@@ -50,7 +50,7 @@ func TestMain(m *testing.M) {
// Install global operator for tests in this package, all tests must use this operatorID
g.Expect(NewNamedTestNamespace(t, operatorNS, false)).ShouldNot(BeNil())
g.Expect(CopyCamelCatalog(t, operatorNS, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, operatorNS, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, operatorNS, "--global", "--force")).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, operatorNS, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
exitCode := m.Run()
diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go
index bf95dc437..548cb95bc 100644
--- a/e2e/common/cli/run_test.go
+++ b/e2e/common/cli/run_test.go
@@ -192,7 +192,7 @@ func TestKamelCLIRun(t *testing.T) {
}
// Requires a local integration platform in order to resolve the insecure registry
// Install platform (use the installer to get staging if present)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-operator-setup")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
@@ -219,7 +219,7 @@ func TestKamelCLIRun(t *testing.T) {
}
// Requires a local integration platform in order to resolve the insecure registry
// Install platform (use the installer to get staging if present)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-operator-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-operator-setup")).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Expect(KamelRunWithID(t, operatorID, ns, "../traits/files/jvm/Classpath.java",
diff --git a/e2e/common/config/config_reload_test.go b/e2e/common/config/config_reload_test.go
index cf12faa24..d59c719ad 100644
--- a/e2e/common/config/config_reload_test.go
+++ b/e2e/common/config/config_reload_test.go
@@ -42,7 +42,7 @@ func TestConfigmapHotReload(t *testing.T) {
operatorID := "camel-k-config-hot-reload"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
@@ -78,7 +78,7 @@ func TestConfigmapHotReloadDefault(t *testing.T) {
operatorID := "camel-k-config-hot-reload-default"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
@@ -111,7 +111,7 @@ func TestSecretHotReload(t *testing.T) {
operatorID := "camel-k-secret-hot-reload"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
@@ -154,7 +154,7 @@ func CheckConfigmapWithOwnerRef(t *testing.T, hotreload bool) {
operatorID := fmt.Sprintf("camel-k-config-owner-ref-%s", strconv.FormatBool(hotreload))
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go
index f8978f2bb..fee946697 100644
--- a/e2e/common/config/config_test.go
+++ b/e2e/common/config/config_test.go
@@ -41,7 +41,7 @@ func TestRunConfigExamples(t *testing.T) {
operatorID := "camel-k-config"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/config/kamelet_config_test.go b/e2e/common/config/kamelet_config_test.go
index e40d0f4c4..67114fded 100644
--- a/e2e/common/config/kamelet_config_test.go
+++ b/e2e/common/config/kamelet_config_test.go
@@ -42,7 +42,7 @@ func TestKameletImplicitConfigDefaultUserProperty(t *testing.T) {
operatorID := "camel-k-config-kamelet-user-property"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
@@ -60,22 +60,9 @@ func TestKameletImplicitConfigDefaultUserProperty(t *testing.T) {
g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "iconfig01-timer-source")).To(Succeed())
- })
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletImplicitConfigDefaultMountedSecret(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-secret-mount"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config using mounted secret", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig03-timer-source")()).To(Succeed())
@@ -99,22 +86,9 @@ func TestKameletImplicitConfigDefaultMountedSecret(t *testing.T) {
g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "iconfig03-timer-source")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletImplicitConfigDefaultMountedConfigmap(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-configmap-mount"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config using mounted configmap", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig04-timer-source")()).To(Succeed())
@@ -136,22 +110,9 @@ func TestKameletImplicitConfigDefaultMountedConfigmap(t *testing.T) {
g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "iconfig04-timer-source")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletImplicitConfigNamedUserProperty(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-named-property"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test named config using properties", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig05-timer-source")()).To(Succeed())
@@ -167,22 +128,9 @@ func TestKameletImplicitConfigNamedUserProperty(t *testing.T) {
g.Expect(Kamel(t, "delete", name, "-n", ns).Execute()).To(Succeed())
g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "iconfig05-timer-source")).To(Succeed())
- })
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-secret-labeled-named"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test named config using labeled secret", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig06-timer-source")()).To(Succeed())
@@ -209,22 +157,9 @@ func TestKameletImplicitConfigNamedLabeledSecret(t *testing.T) {
g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "iconfig06-timer-source")).To(Succeed())
- })
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletImplicitConfigNamedMountedSecret(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-secret-mount-named"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test named config using mounted secret", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig07-timer-source")()).To(Succeed())
@@ -249,22 +184,9 @@ func TestKameletImplicitConfigNamedMountedSecret(t *testing.T) {
g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "iconfig07-timer-source")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletImplicitConfigNamedMountedConfigmap(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-configmap-mount-named"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test named config using mounted configmap", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig08-timer-source")()).To(Succeed())
@@ -287,22 +209,9 @@ func TestKameletImplicitConfigNamedMountedConfigmap(t *testing.T) {
g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "iconfig08-timer-source")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-secret-labeled"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config using labeled secret", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "iconfig09-timer-source")()).To(Succeed())
@@ -327,24 +236,9 @@ func TestKameletImplicitConfigDefaultLabeledSecret(t *testing.T) {
g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
g.Eventually(SecretByName(t, ns, secretName), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "iconfig09-timer-source")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-// Tests on integration with kamelets containing configuration from properties and secrets with parameters inside the integration.
-func TestKameletConfigInlinedUserProperty(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-user-property-inlined"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config inlined properties", func(t *testing.T) {
g.Expect(CreateTimerKamelet(t, operatorID, ns, "config01-timer-source")()).To(Succeed())
@@ -362,22 +256,9 @@ func TestKameletConfigInlinedUserProperty(t *testing.T) {
g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "config01-timer-source")).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "config01-log-sink")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-func TestKameletConfigDefaultParamUserProperty(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-user-property-param"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config parameters properties", func(t *testing.T) {
@@ -398,22 +279,9 @@ func TestKameletConfigDefaultParamUserProperty(t *testing.T) {
g.Eventually(Integration(t, ns, name), TestTimeoutLong).Should(BeNil())
g.Expect(DeleteKamelet(t, ns, "config02-timer-source")).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "config02-log-sink")).To(Succeed())
- })
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletConfigDefaultParamMountedSecret(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-secret-mount-param"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
-
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config secret properties", func(t *testing.T) {
@@ -440,22 +308,9 @@ func TestKameletConfigDefaultParamMountedSecret(t *testing.T) {
g.Expect(DeleteSecret(t, ns, secretName)).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "config03-timer-source")).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "config03-log-sink")).To(Succeed())
- })
-
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
- })
-}
-
-func TestKameletConfigDefaultParamMountedConfigmap(t *testing.T) {
- t.Parallel()
-
- WithNewTestNamespace(t, func(g *WithT, ns string) {
- operatorID := "camel-k-config-kamelet-configmap-mount-param"
- g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
- g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
- g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
t.Run("run test default config configmap properties", func(t *testing.T) {
@@ -482,8 +337,9 @@ func TestKameletConfigDefaultParamMountedConfigmap(t *testing.T) {
g.Expect(DeleteConfigmap(t, ns, cmName)).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "config04-timer-source")).To(Succeed())
g.Expect(DeleteKamelet(t, ns, "config04-log-sink")).To(Succeed())
+
+ g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
- g.Expect(Kamel(t, "delete", "--all", "-n", ns).Execute()).To(Succeed())
})
}
diff --git a/e2e/common/config/pipe_config_test.go b/e2e/common/config/pipe_config_test.go
index 220b7cf53..b896e7f8a 100644
--- a/e2e/common/config/pipe_config_test.go
+++ b/e2e/common/config/pipe_config_test.go
@@ -40,7 +40,7 @@ func TestPipeConfig(t *testing.T) {
operatorID := "camel-k-config"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/groovy_test.go b/e2e/common/languages/groovy_test.go
index 02bcf7253..d4aa49724 100644
--- a/e2e/common/languages/groovy_test.go
+++ b/e2e/common/languages/groovy_test.go
@@ -40,7 +40,7 @@ func TestRunSimpleGroovyExamples(t *testing.T) {
operatorID := "camel-k-runtimes-groovy"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/java_test.go b/e2e/common/languages/java_test.go
index 9e2ee0e4d..9e6873e11 100644
--- a/e2e/common/languages/java_test.go
+++ b/e2e/common/languages/java_test.go
@@ -40,7 +40,7 @@ func TestRunSimpleJavaExamples(t *testing.T) {
operatorID := "camel-k-runtimes-java"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/js_test.go b/e2e/common/languages/js_test.go
index 4a0218156..4234f2807 100644
--- a/e2e/common/languages/js_test.go
+++ b/e2e/common/languages/js_test.go
@@ -40,7 +40,7 @@ func TestRunSimpleJavaScriptExamples(t *testing.T) {
operatorID := "camel-k-runtimes-js"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/kotlin_test.go b/e2e/common/languages/kotlin_test.go
index 190d76cde..e1e360d46 100644
--- a/e2e/common/languages/kotlin_test.go
+++ b/e2e/common/languages/kotlin_test.go
@@ -40,7 +40,7 @@ func TestRunSimpleKotlinExamples(t *testing.T) {
operatorID := "camel-k-runtimes-kotlin"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/polyglot_test.go b/e2e/common/languages/polyglot_test.go
index d52f79c4c..21a5d51f1 100644
--- a/e2e/common/languages/polyglot_test.go
+++ b/e2e/common/languages/polyglot_test.go
@@ -40,7 +40,7 @@ func TestRunPolyglotExamples(t *testing.T) {
operatorID := "camel-k-runtimes-polyglot"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/xml_test.go b/e2e/common/languages/xml_test.go
index 53ee19bbe..a53d4da32 100644
--- a/e2e/common/languages/xml_test.go
+++ b/e2e/common/languages/xml_test.go
@@ -40,7 +40,7 @@ func TestRunSimpleXmlExamples(t *testing.T) {
operatorID := "camel-k-runtimes-xml"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/languages/yaml_test.go b/e2e/common/languages/yaml_test.go
index a78465c6e..270445375 100644
--- a/e2e/common/languages/yaml_test.go
+++ b/e2e/common/languages/yaml_test.go
@@ -40,7 +40,7 @@ func TestRunSimpleYamlExamples(t *testing.T) {
operatorID := "camel-k-runtimes-yaml"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/cron_test.go b/e2e/common/misc/cron_test.go
index de2abf7ef..76948bbb8 100644
--- a/e2e/common/misc/cron_test.go
+++ b/e2e/common/misc/cron_test.go
@@ -40,7 +40,7 @@ func TestRunCronExample(t *testing.T) {
operatorID := "camel-k-cron"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/integration_fail_test.go b/e2e/common/misc/integration_fail_test.go
index 73f2223d1..b2468bea3 100644
--- a/e2e/common/misc/integration_fail_test.go
+++ b/e2e/common/misc/integration_fail_test.go
@@ -41,7 +41,7 @@ func TestBadRouteIntegration(t *testing.T) {
operatorID := "camel-k-bad-route"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/integration_trait_update_test.go b/e2e/common/misc/integration_trait_update_test.go
index 5a4be2dfe..d56fee0f1 100644
--- a/e2e/common/misc/integration_trait_update_test.go
+++ b/e2e/common/misc/integration_trait_update_test.go
@@ -40,7 +40,7 @@ func TestTraitUpdates(t *testing.T) {
operatorID := "camel-k-trait-update"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/kamelet_test.go b/e2e/common/misc/kamelet_test.go
index a71b60a10..6558d4ba8 100644
--- a/e2e/common/misc/kamelet_test.go
+++ b/e2e/common/misc/kamelet_test.go
@@ -40,7 +40,7 @@ func TestKameletClasspathLoading(t *testing.T) {
operatorID := "camel-k-kamelet-loading"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/kamelet_update_test.go b/e2e/common/misc/kamelet_update_test.go
index 10d9ec9f7..f97eb530c 100644
--- a/e2e/common/misc/kamelet_update_test.go
+++ b/e2e/common/misc/kamelet_update_test.go
@@ -41,7 +41,7 @@ func TestBundleKameletUpdate(t *testing.T) {
operatorID := "camel-k-kamelet-bundle"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/maven_repository_test.go b/e2e/common/misc/maven_repository_test.go
index 9f57b9efb..5b2ea10d1 100644
--- a/e2e/common/misc/maven_repository_test.go
+++ b/e2e/common/misc/maven_repository_test.go
@@ -40,7 +40,7 @@ func TestRunExtraRepository(t *testing.T) {
operatorID := "camel-k-extra-repository"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/pipe_test.go b/e2e/common/misc/pipe_test.go
index 5d97ed3a3..ef2f60936 100644
--- a/e2e/common/misc/pipe_test.go
+++ b/e2e/common/misc/pipe_test.go
@@ -41,7 +41,7 @@ func TestPipe(t *testing.T) {
operatorID := "camel-k-pipe"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/pipe_with_image_test.go b/e2e/common/misc/pipe_with_image_test.go
index 59bbe2277..f898de01b 100644
--- a/e2e/common/misc/pipe_with_image_test.go
+++ b/e2e/common/misc/pipe_with_image_test.go
@@ -41,7 +41,7 @@ func TestPipeWithImage(t *testing.T) {
operatorID := "camel-k-pipe-image"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/registry_maven_wagon_test.go b/e2e/common/misc/registry_maven_wagon_test.go
index 2d93ce51e..a7643f175 100644
--- a/e2e/common/misc/registry_maven_wagon_test.go
+++ b/e2e/common/misc/registry_maven_wagon_test.go
@@ -51,7 +51,7 @@ func TestImageRegistryIsAMavenRepository(t *testing.T) {
operatorID := "camel-k-rest"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/rest_test.go b/e2e/common/misc/rest_test.go
index 1a4f30492..1bbfdaf16 100644
--- a/e2e/common/misc/rest_test.go
+++ b/e2e/common/misc/rest_test.go
@@ -45,7 +45,7 @@ func TestRunRest(t *testing.T) {
operatorID := "camel-k-rest"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/scale_binding_test.go b/e2e/common/misc/scale_binding_test.go
index f9dae8451..adc9fd36b 100644
--- a/e2e/common/misc/scale_binding_test.go
+++ b/e2e/common/misc/scale_binding_test.go
@@ -46,7 +46,7 @@ func TestPipeScale(t *testing.T) {
operatorID := "camel-k-pipe-scale"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/scale_integration_test.go b/e2e/common/misc/scale_integration_test.go
index bad583991..c3b697427 100644
--- a/e2e/common/misc/scale_integration_test.go
+++ b/e2e/common/misc/scale_integration_test.go
@@ -45,7 +45,7 @@ func TestIntegrationScale(t *testing.T) {
operatorID := "camel-k-integration-scale"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/misc/structured_logs_test.go b/e2e/common/misc/structured_logs_test.go
index 5214aaeb9..47d7d59ec 100644
--- a/e2e/common/misc/structured_logs_test.go
+++ b/e2e/common/misc/structured_logs_test.go
@@ -41,7 +41,7 @@ func TestStructuredLogs(t *testing.T) {
operatorID := "camel-k-structured-logs"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/runtimes/runtimes_test.go b/e2e/common/runtimes/runtimes_test.go
index 81ed54642..fa43dd530 100644
--- a/e2e/common/runtimes/runtimes_test.go
+++ b/e2e/common/runtimes/runtimes_test.go
@@ -40,7 +40,7 @@ func TestSourceLessIntegrations(t *testing.T) {
operatorID := "camel-k-runtimes"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/affinity_test.go b/e2e/common/traits/affinity_test.go
index 73a75b94d..8621cd8fb 100644
--- a/e2e/common/traits/affinity_test.go
+++ b/e2e/common/traits/affinity_test.go
@@ -43,7 +43,7 @@ func TestAffinityTrait(t *testing.T) {
operatorID := "camel-k-traits-affinity"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/builder_test.go b/e2e/common/traits/builder_test.go
index 6f8d8f860..42dc5b1b7 100644
--- a/e2e/common/traits/builder_test.go
+++ b/e2e/common/traits/builder_test.go
@@ -43,7 +43,7 @@ func TestBuilderTrait(t *testing.T) {
operatorID := "camel-k-traits-builder"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/camel_test.go b/e2e/common/traits/camel_test.go
index f9f6b4ab3..439bca8f2 100644
--- a/e2e/common/traits/camel_test.go
+++ b/e2e/common/traits/camel_test.go
@@ -40,7 +40,7 @@ func TestCamelTrait(t *testing.T) {
operatorID := "camel-k-traits-camel"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/container_test.go b/e2e/common/traits/container_test.go
index a5fd859d3..12e1937f2 100644
--- a/e2e/common/traits/container_test.go
+++ b/e2e/common/traits/container_test.go
@@ -41,7 +41,7 @@ func TestContainerTrait(t *testing.T) {
operatorID := "camel-k-traits-container"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/deployment_test.go b/e2e/common/traits/deployment_test.go
index 67fcf4bd5..68d57b6b5 100644
--- a/e2e/common/traits/deployment_test.go
+++ b/e2e/common/traits/deployment_test.go
@@ -44,7 +44,7 @@ func TestRecreateDeploymentStrategyTrait(t *testing.T) {
operatorID := "camel-k-traits-deployment"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
@@ -91,7 +91,7 @@ func TestRollingUpdateDeploymentStrategyTrait(t *testing.T) {
operatorID := "camel-k-traits-deployment-rolling"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/error_handler_test.go b/e2e/common/traits/error_handler_test.go
index 73a102375..3292750f7 100644
--- a/e2e/common/traits/error_handler_test.go
+++ b/e2e/common/traits/error_handler_test.go
@@ -40,7 +40,7 @@ func TestErrorHandlerTrait(t *testing.T) {
operatorID := "camel-k-traits-errorhandler"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/errored_trait_test.go b/e2e/common/traits/errored_trait_test.go
index 6b807221d..9d967d2df 100644
--- a/e2e/common/traits/errored_trait_test.go
+++ b/e2e/common/traits/errored_trait_test.go
@@ -40,7 +40,7 @@ func TestErroredTrait(t *testing.T) {
operatorID := "camel-k-traits-error"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/health_test.go b/e2e/common/traits/health_test.go
index 13914cc6e..0f2ff7bf9 100644
--- a/e2e/common/traits/health_test.go
+++ b/e2e/common/traits/health_test.go
@@ -49,7 +49,7 @@ func TestHealthTrait(t *testing.T) {
operatorID := "camel-k-traits-health"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/istio_test.go b/e2e/common/traits/istio_test.go
index 0fd149802..97cafe4b5 100644
--- a/e2e/common/traits/istio_test.go
+++ b/e2e/common/traits/istio_test.go
@@ -41,7 +41,7 @@ func TestIstioTrait(t *testing.T) {
operatorID := "camel-k-traits-istio"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/jolokia_test.go b/e2e/common/traits/jolokia_test.go
index 419b9f880..470732744 100644
--- a/e2e/common/traits/jolokia_test.go
+++ b/e2e/common/traits/jolokia_test.go
@@ -42,7 +42,7 @@ func TestJolokiaTrait(t *testing.T) {
operatorID := "camel-k-traits-jolokia"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/jvm_test.go b/e2e/common/traits/jvm_test.go
index 5f220a587..329c90f90 100644
--- a/e2e/common/traits/jvm_test.go
+++ b/e2e/common/traits/jvm_test.go
@@ -43,7 +43,7 @@ func TestJVMTrait(t *testing.T) {
operatorID := "camel-k-traits-jvm"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/kamelet_test.go b/e2e/common/traits/kamelet_test.go
index 2d2516f2d..d04d84803 100644
--- a/e2e/common/traits/kamelet_test.go
+++ b/e2e/common/traits/kamelet_test.go
@@ -40,7 +40,7 @@ func TestKameletTrait(t *testing.T) {
operatorID := "camel-k-traits-kamelet"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/master_test.go b/e2e/common/traits/master_test.go
index 65713e2bd..014b26c33 100644
--- a/e2e/common/traits/master_test.go
+++ b/e2e/common/traits/master_test.go
@@ -42,7 +42,7 @@ func TestMasterTrait(t *testing.T) {
operatorID := "camel-k-traits-master"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/openapi_test.go b/e2e/common/traits/openapi_test.go
index 2ac84e4d2..e761d632a 100644
--- a/e2e/common/traits/openapi_test.go
+++ b/e2e/common/traits/openapi_test.go
@@ -42,7 +42,7 @@ func TestOpenAPI(t *testing.T) {
operatorID := "camel-k-traits-openapi"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/pdb_test.go b/e2e/common/traits/pdb_test.go
index b6b355121..bd6e91a2e 100644
--- a/e2e/common/traits/pdb_test.go
+++ b/e2e/common/traits/pdb_test.go
@@ -49,7 +49,7 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
operatorID := "camel-k-traits-pdb"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/pod_test.go b/e2e/common/traits/pod_test.go
index 28b05cae8..fbe662c8e 100644
--- a/e2e/common/traits/pod_test.go
+++ b/e2e/common/traits/pod_test.go
@@ -40,7 +40,7 @@ func TestPodTrait(t *testing.T) {
operatorID := "camel-k-traits-pod"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/prometheus_test.go b/e2e/common/traits/prometheus_test.go
index 6d11d9df2..1937e1de8 100644
--- a/e2e/common/traits/prometheus_test.go
+++ b/e2e/common/traits/prometheus_test.go
@@ -50,7 +50,7 @@ func TestPrometheusTrait(t *testing.T) {
operatorID := "camel-k-traits-prometheus"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/pull_secret_test.go b/e2e/common/traits/pull_secret_test.go
index 1267e9fa6..989e67b97 100644
--- a/e2e/common/traits/pull_secret_test.go
+++ b/e2e/common/traits/pull_secret_test.go
@@ -42,7 +42,7 @@ func TestPullSecretTrait(t *testing.T) {
operatorID := "camel-k-traits-pull-secret"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/route_test.go b/e2e/common/traits/route_test.go
index b8b031c4b..3df769452 100644
--- a/e2e/common/traits/route_test.go
+++ b/e2e/common/traits/route_test.go
@@ -78,7 +78,7 @@ func TestRunRoutes(t *testing.T) {
operatorID := "camel-k-traits-route"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile=openshift").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile=openshift")).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/service_binding_test.go b/e2e/common/traits/service_binding_test.go
index 6f07f0f12..8eca83f10 100644
--- a/e2e/common/traits/service_binding_test.go
+++ b/e2e/common/traits/service_binding_test.go
@@ -42,7 +42,7 @@ func TestServiceBindingTrait(t *testing.T) {
operatorID := "camel-k-traits-service-binding"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/service_test.go b/e2e/common/traits/service_test.go
index def097354..ea776dd1c 100644
--- a/e2e/common/traits/service_test.go
+++ b/e2e/common/traits/service_test.go
@@ -41,7 +41,7 @@ func TestServiceTrait(t *testing.T) {
operatorID := "camel-k-traits-service"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/common/traits/toleration_test.go b/e2e/common/traits/toleration_test.go
index 64491bdb1..e47330f73 100644
--- a/e2e/common/traits/toleration_test.go
+++ b/e2e/common/traits/toleration_test.go
@@ -42,7 +42,7 @@ func TestTolerationTrait(t *testing.T) {
operatorID := "camel-k-traits-toleration"
g.Expect(CopyCamelCatalog(t, ns, operatorID)).To(Succeed())
g.Expect(CopyIntegrationKits(t, ns, operatorID)).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(SelectedPlatformPhase(t, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/install/cli/global_kamelet_test.go b/e2e/install/cli/global_kamelet_test.go
index 15ae5871e..160b763a6 100644
--- a/e2e/install/cli/global_kamelet_test.go
+++ b/e2e/install/cli/global_kamelet_test.go
@@ -34,7 +34,7 @@ import (
func TestRunGlobalKamelet(t *testing.T) {
WithGlobalOperatorNamespace(t, func(g *WithT, operatorNamespace string) {
operatorID := "camel-k-global-kamelet"
- g.Expect(KamelInstallWithID(t, operatorID, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, operatorNamespace, "--global", "--force")).To(Succeed())
t.Run("Global operator + namespaced kamelet test", func(t *testing.T) {
@@ -42,7 +42,7 @@ func TestRunGlobalKamelet(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns2 string) {
g.Expect(CreateTimerKamelet(t, operatorID, ns2, "my-own-timer-source")()).To(Succeed())
- g.Expect(KamelInstallWithID(t, operatorID, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns2, "--skip-operator-setup", "--olm=false")).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns2, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ns2, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
@@ -57,7 +57,7 @@ func TestRunGlobalKamelet(t *testing.T) {
// NS3: namespace without operator
WithNewTestNamespace(t, func(g *WithT, ns3 string) {
- g.Expect(KamelInstallWithID(t, operatorID, ns3, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns3, "--skip-operator-setup", "--olm=false")).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns3, "files/timer-kamelet-usage.groovy").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ns3, "timer-kamelet-usage"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
diff --git a/e2e/install/cli/global_test.go b/e2e/install/cli/global_test.go
index c0f3cb05d..10db634ca 100644
--- a/e2e/install/cli/global_test.go
+++ b/e2e/install/cli/global_test.go
@@ -41,7 +41,7 @@ import (
func TestRunGlobalInstall(t *testing.T) {
WithGlobalOperatorNamespace(t, func(g *WithT, operatorNamespace string) {
- g.Expect(KamelInstall(t, operatorNamespace, "--global", "--force").Execute()).To(Succeed())
+ g.Expect(KamelInstall(t, operatorNamespace, "--global", "--force")).To(Succeed())
g.Eventually(OperatorPodPhase(t, operatorNamespace), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
t.Run("Global CamelCatalog reconciliation", func(t *testing.T) {
@@ -56,7 +56,7 @@ func TestRunGlobalInstall(t *testing.T) {
t.Run("Global test on namespace with platform", func(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns2 string) {
// Creating namespace local platform
- g.Expect(KamelInstall(t, ns2, "--skip-operator-setup", "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstall(t, ns2, "--skip-operator-setup", "--olm=false")).To(Succeed())
g.Eventually(Platform(t, ns2)).ShouldNot(BeNil())
// Run with global operator id
@@ -77,9 +77,9 @@ func TestRunGlobalInstall(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns3 string) {
operatorID := "camel-k-local-ns3"
if NoOlmOperatorImage != "" {
- g.Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false", "--operator-image", NoOlmOperatorImage).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false", "--operator-image", NoOlmOperatorImage)).To(Succeed())
} else {
- g.Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns3, "--olm=false")).To(Succeed())
}
g.Eventually(OperatorPodPhase(t, ns3), TestTimeoutMedium).Should(Equal(corev1.PodRunning))
g.Expect(KamelRunWithID(t, operatorID, ns3, "files/Java.java").Execute()).To(Succeed())
diff --git a/e2e/install/cli/install_test.go b/e2e/install/cli/install_test.go
index 35fdb2e84..7500b6eb3 100644
--- a/e2e/install/cli/install_test.go
+++ b/e2e/install/cli/install_test.go
@@ -49,7 +49,7 @@ import (
func TestBasicInstallation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
g.Eventually(PlatformConditionStatus(t, ns, v1.IntegrationPlatformConditionTypeCreated), TestTimeoutShort).
@@ -108,7 +108,7 @@ func TestBasicInstallation(t *testing.T) {
func TestAlternativeImageInstallation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false", "--operator-image", "x/y:latest").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false", "--operator-image", "x/y:latest")).To(Succeed())
g.Eventually(OperatorImage(t, ns)).Should(Equal("x/y:latest"))
})
}
@@ -116,7 +116,7 @@ func TestAlternativeImageInstallation(t *testing.T) {
func TestKitMainInstallation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Expect(Kamel(t, "kit", "create", "timer", "-d", "camel:timer", "-x", operatorID, "-n", ns).Execute()).To(Succeed())
g.Eventually(Build(t, ns, "timer"), TestTimeoutMedium).ShouldNot(BeNil())
})
@@ -125,7 +125,7 @@ func TestKitMainInstallation(t *testing.T) {
func TestMavenRepositoryInstallation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--maven-repository", "https://my.repo.org/public/").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--maven-repository", "https://my.repo.org/public/")).To(Succeed())
configmapName := fmt.Sprintf("%s-maven-settings", operatorID)
g.Eventually(Configmap(t, ns, configmapName)).Should(Not(BeNil()))
g.Eventually(func() string {
@@ -141,7 +141,7 @@ func TestMavenRepositoryInstallation(t *testing.T) {
func TestSkipRegistryInstallation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-registry-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--skip-registry-setup")).To(Succeed())
g.Eventually(Platform(t, ns)).ShouldNot(BeNil())
g.Eventually(func() v1.RegistrySpec {
return Platform(t, ns)().Spec.Build.Registry
@@ -181,7 +181,7 @@ func TestConsoleCliDownload(t *testing.T) {
}
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(ConsoleCLIDownload(t, name), TestTimeoutMedium).Should(Not(BeNil()))
cliDownload = ConsoleCLIDownload(t, name)()
@@ -206,7 +206,7 @@ func TestConsoleCliDownload(t *testing.T) {
func TestInstallSkipDefaultKameletsInstallation(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns, "--skip-default-kamelets-setup").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns, "--skip-default-kamelets-setup")).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Expect(KameletList(t, ns)()).Should(BeEmpty())
})
@@ -215,7 +215,7 @@ func TestInstallSkipDefaultKameletsInstallation(t *testing.T) {
func TestInstallDebugLogging(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "-z", "debug").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "-z", "debug")).To(Succeed())
g.Eventually(OperatorEnvVarValue(t, ns, "LOG_LEVEL"), TestTimeoutLong).Should(Equal("debug"))
})
diff --git a/e2e/install/cli/maven_ca_secret_test.go b/e2e/install/cli/maven_ca_secret_test.go
index e5096735c..595b4c331 100644
--- a/e2e/install/cli/maven_ca_secret_test.go
+++ b/e2e/install/cli/maven_ca_secret_test.go
@@ -427,7 +427,7 @@ ProxyPreserveHost On
"--maven-ca-secret", secret.Name+"/"+corev1.TLSCertKey,
// Active batch mode to assert dependencies download
"--maven-cli-option", "--batch-mode",
- ).Execute()).To(Succeed())
+ )).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
diff --git a/e2e/install/cli/uninstall_test.go b/e2e/install/cli/uninstall_test.go
index 5989848ae..5eb0ef0b1 100644
--- a/e2e/install/cli/uninstall_test.go
+++ b/e2e/install/cli/uninstall_test.go
@@ -36,7 +36,7 @@ func TestBasicUninstall(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Eventually(DefaultCamelCatalogPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
@@ -71,7 +71,7 @@ func TestUninstallSkipOperator(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except operator
g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-operator").Execute()).To(Succeed())
@@ -83,7 +83,7 @@ func TestUninstallSkipRole(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false")).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except roles
g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-roles").Execute()).To(Succeed())
@@ -95,7 +95,7 @@ func TestUninstallSkipRoleBinding(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false")).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except role-bindings
g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-role-bindings").Execute()).To(Succeed())
@@ -107,7 +107,7 @@ func TestUninstallSkipServiceAccounts(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--olm=false")).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except cluster-roles
g.Expect(Kamel(t, "uninstall", "-n", ns, "--skip-crd", "--skip-cluster-roles", "--skip-service-accounts").Execute()).To(Succeed())
@@ -119,7 +119,7 @@ func TestUninstallSkipIntegrationPlatform(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
// on uninstall it should remove everything except cluster-roles
// NOTE: skip CRDs is also required in addition to skip integration platform
@@ -132,7 +132,7 @@ func TestUninstallSkipKamelets(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Eventually(KameletList(t, ns)).ShouldNot(BeEmpty())
// on uninstall it should remove everything except kamelets
@@ -145,7 +145,7 @@ func TestUninstallSkipCamelCatalogs(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
// a successful new installation
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(OperatorPod(t, ns)).ShouldNot(BeNil())
g.Eventually(CamelCatalogList(t, ns)).ShouldNot(BeEmpty())
// on uninstall it should remove everything except camel catalogs
diff --git a/e2e/install/upgrade/cli_upgrade_test.go b/e2e/install/upgrade/cli_upgrade_test.go
index dfc1362e6..2fffef78a 100644
--- a/e2e/install/upgrade/cli_upgrade_test.go
+++ b/e2e/install/upgrade/cli_upgrade_test.go
@@ -95,7 +95,7 @@ func TestCLIOperatorUpgrade(t *testing.T) {
g.Expect(os.Setenv("KAMEL_BIN", "")).To(Succeed())
// Upgrade the operator by installing the current version
- g.Expect(KamelInstall(t, ns, "--olm=false", "--force", "--operator-image", image, "--base-image", defaults.BaseImage()).Execute()).To(Succeed())
+ g.Expect(KamelInstall(t, ns, "--olm=false", "--force", "--operator-image", image, "--base-image", defaults.BaseImage())).To(Succeed())
// Check the operator image is the current built one
g.Eventually(OperatorImage(t, ns)).Should(Equal(image))
diff --git a/e2e/knative/knative_platform_test.go b/e2e/knative/knative_platform_test.go
index e43b6c9ae..743332f7b 100644
--- a/e2e/knative/knative_platform_test.go
+++ b/e2e/knative/knative_platform_test.go
@@ -50,7 +50,7 @@ func TestKnativePlatformDetection(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-knative"
// Install without profile (should automatically detect the presence of Knative)
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
g.Eventually(PlatformProfile(t, ns), TestTimeoutShort).Should(Equal(v1.TraitProfile("")))
cluster := Platform(t, ns)().Status.Cluster
diff --git a/e2e/knative/knative_test.go b/e2e/knative/knative_test.go
index a6ba857b7..600f423fa 100644
--- a/e2e/knative/knative_test.go
+++ b/e2e/knative/knative_test.go
@@ -139,7 +139,7 @@ func TestKnative(t *testing.T) {
func TestRunBroker(t *testing.T) {
WithNewTestNamespaceWithKnativeBroker(t, func(g *WithT, ns string) {
operatorID := fmt.Sprintf("camel-k-%s", ns)
- g.Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile", "knative").Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns, "--trait-profile", "knative")).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns, "files/knativeevt1.groovy").Execute()).To(Succeed())
g.Expect(KamelRunWithID(t, operatorID, ns, "files/knativeevt2.groovy").Execute()).To(Succeed())
diff --git a/e2e/native/native_binding_test.go b/e2e/native/native_binding_test.go
index a04cd8293..7bf2ea840 100644
--- a/e2e/native/native_binding_test.go
+++ b/e2e/native/native_binding_test.go
@@ -36,7 +36,7 @@ func TestNativeBinding(t *testing.T) {
g.Expect(KamelInstallWithIDAndKameletCatalog(t, operatorID, ns,
"--build-timeout", "90m0s",
"--maven-cli-option", "-Dquarkus.native.native-image-xmx=6g",
- ).Execute()).To(Succeed())
+ )).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
message := "Magicstring!"
t.Run("binding with native build", func(t *testing.T) {
diff --git a/e2e/native/native_test.go b/e2e/native/native_test.go
index 479642c93..9f04bbf82 100644
--- a/e2e/native/native_test.go
+++ b/e2e/native/native_test.go
@@ -40,7 +40,7 @@ func TestNativeIntegrations(t *testing.T) {
g.Expect(KamelInstallWithID(t, operatorID, ns,
"--build-timeout", "90m0s",
"--maven-cli-option", "-Dquarkus.native.native-image-xmx=6g",
- ).Execute()).To(Succeed())
+ )).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
t.Run("unsupported integration source language", func(t *testing.T) {
diff --git a/e2e/native/native_with_sources_test.go b/e2e/native/native_with_sources_test.go
index a2ded791b..ac6e49e79 100644
--- a/e2e/native/native_with_sources_test.go
+++ b/e2e/native/native_with_sources_test.go
@@ -38,7 +38,7 @@ func TestNativeHighMemoryIntegrations(t *testing.T) {
g.Expect(KamelInstallWithID(t, operatorID, ns,
"--build-timeout", "90m0s",
"--maven-cli-option", "-Dquarkus.native.native-image-xmx=9g",
- ).Execute()).To(Succeed())
+ )).To(Succeed())
g.Eventually(PlatformPhase(t, ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
javaNativeName := RandomizedSuffixName("java-native")
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index b5cabc7a1..e9fe94d63 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -141,6 +141,7 @@ var testClient client.Client
var clientMutex = sync.Mutex{}
var kamelCLIMutex = sync.Mutex{}
+var kamelInstallMutex = sync.Mutex{}
// Only panic the test if absolutely necessary and there is
// no test locus. In most cases, the test should fail gracefully
@@ -262,19 +263,22 @@ func Kamel(t *testing.T, args ...string) *cobra.Command {
return KamelWithContext(t, TestContext, args...)
}
-func KamelInstall(t *testing.T, namespace string, args ...string) *cobra.Command {
+func KamelInstall(t *testing.T, namespace string, args ...string) error {
return KamelInstallWithID(t, platform.DefaultPlatformName, namespace, args...)
}
-func KamelInstallWithID(t *testing.T, operatorID string, namespace string, args ...string) *cobra.Command {
+func KamelInstallWithID(t *testing.T, operatorID string, namespace string, args ...string) error {
return kamelInstallWithContext(t, TestContext, operatorID, namespace, true, args...)
}
-func KamelInstallWithIDAndKameletCatalog(t *testing.T, operatorID string, namespace string, args ...string) *cobra.Command {
+func KamelInstallWithIDAndKameletCatalog(t *testing.T, operatorID string, namespace string, args ...string) error {
return kamelInstallWithContext(t, TestContext, operatorID, namespace, false, args...)
}
-func kamelInstallWithContext(t *testing.T, ctx context.Context, operatorID string, namespace string, skipKameletCatalog bool, args ...string) *cobra.Command {
+func kamelInstallWithContext(t *testing.T, ctx context.Context, operatorID string, namespace string, skipKameletCatalog bool, args ...string) error {
+ kamelInstallMutex.Lock()
+ defer kamelInstallMutex.Unlock()
+
var installArgs []string
installArgs = []string{"install", "-n", namespace, "--operator-id", operatorID, "--skip-cluster-setup"}
@@ -316,7 +320,8 @@ func kamelInstallWithContext(t *testing.T, ctx context.Context, operatorID strin
}
installArgs = append(installArgs, args...)
- return KamelWithContext(t, ctx, installArgs...)
+ installCommand := KamelWithContext(t, ctx, installArgs...)
+ return installCommand.Execute()
}
func KamelRun(t *testing.T, namespace string, args ...string) *cobra.Command {
diff --git a/e2e/telemetry/telemetry_test.go b/e2e/telemetry/telemetry_test.go
index 2ad915d75..cb93fcf84 100644
--- a/e2e/telemetry/telemetry_test.go
+++ b/e2e/telemetry/telemetry_test.go
@@ -37,7 +37,7 @@ import (
func TestTelemetryTrait(t *testing.T) {
WithNewTestNamespace(t, func(g *WithT, ns string) {
operatorID := "camel-k-trait-telemetry"
- g.Expect(KamelInstallWithID(t, operatorID, ns).Execute()).To(Succeed())
+ g.Expect(KamelInstallWithID(t, operatorID, ns)).To(Succeed())
// Check service is available
g.Eventually(ServicesByType(t, "otlp", corev1.ServiceTypeClusterIP), TestTimeoutLong).ShouldNot(BeEmpty())
diff --git a/script/Makefile b/script/Makefile
index f518b09e4..4dd8283e5 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -94,7 +94,7 @@ KAMELET_CATALOG_REPO_TAG := v4.0.1
DO_TEST_PREBUILD ?= true
TEST_PREBUILD = build
# Tests may run in parallel to each other. This count sets the amount of tests run in parallel. (default value usually is GOMAXPROCS)
-TEST_COMMON_PARALLEL_COUNT ?= 4
+TEST_COMMON_PARALLEL_COUNT ?= 2
TEST_ADVANCED_PARALLEL_COUNT ?= 4
# OLM (Operator Lifecycle Manager and Operator Hub): uncomment to override operator settings at build time