You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ts...@apache.org on 2022/12/13 09:37:19 UTC
[camel-k] 07/10: fix(e2e): kustomize tests flakiness by making operator install/cleanup faster
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 06422443f3cc92ffad553eb68bce89c68f9e4e72
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Fri Dec 9 14:02:23 2022 +0900
fix(e2e): kustomize tests flakiness by making operator install/cleanup faster
---
e2e/namespace/install/kustomize/operator_test.go | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/e2e/namespace/install/kustomize/operator_test.go b/e2e/namespace/install/kustomize/operator_test.go
index 03654d05f..63ee49ddf 100644
--- a/e2e/namespace/install/kustomize/operator_test.go
+++ b/e2e/namespace/install/kustomize/operator_test.go
@@ -45,7 +45,10 @@ func TestBasicOperator(t *testing.T) {
WithNewTestNamespace(t, func(ns string) {
ExecMake(t, Make("setup-cluster", fmt.Sprintf("NAMESPACE=%s", ns)))
ExecMake(t, Make("setup", fmt.Sprintf("NAMESPACE=%s", ns)))
- ExecMake(t, Make("operator", fmt.Sprintf("NAMESPACE=%s", ns)))
+ // Skip default kamelets installation for faster test runs
+ ExecMake(t, Make("operator",
+ fmt.Sprintf("NAMESPACE=%s", ns),
+ "INSTALL_DEFAULT_KAMELETS=false"))
Eventually(OperatorPod(ns)).ShouldNot(BeNil())
})
@@ -66,9 +69,14 @@ func TestAlternativeImageOperator(t *testing.T) {
ExecMake(t, Make("setup-cluster", fmt.Sprintf("NAMESPACE=%s", ns)))
ExecMake(t, Make("setup", fmt.Sprintf("NAMESPACE=%s", ns)))
+ // Skip default kamelets installation for faster test runs
newImage := "quay.io/kameltest/kamel-operator"
newTag := "1.1.1"
- ExecMake(t, Make("operator", fmt.Sprintf("CUSTOM_IMAGE=%s", newImage), fmt.Sprintf("CUSTOM_VERSION=%s", newTag), fmt.Sprintf("NAMESPACE=%s", ns)))
+ ExecMake(t, Make("operator",
+ fmt.Sprintf("CUSTOM_IMAGE=%s", newImage),
+ fmt.Sprintf("CUSTOM_VERSION=%s", newTag),
+ fmt.Sprintf("NAMESPACE=%s", ns),
+ "INSTALL_DEFAULT_KAMELETS=false"))
Eventually(OperatorImage(ns)).Should(Equal(fmt.Sprintf("%s:%s", newImage, newTag)))
})
@@ -88,7 +96,11 @@ func TestGlobalOperator(t *testing.T) {
ExecMake(t, Make("setup-cluster", fmt.Sprintf("NAMESPACE=%s", ns)))
ExecMake(t, Make("setup", fmt.Sprintf("NAMESPACE=%s", ns), "GLOBAL=true"))
- ExecMake(t, Make("operator", fmt.Sprintf("NAMESPACE=%s", ns), "GLOBAL=true"))
+ // Skip default kamelets installation for faster test runs
+ ExecMake(t, Make("operator",
+ fmt.Sprintf("NAMESPACE=%s", ns),
+ "GLOBAL=true",
+ "INSTALL_DEFAULT_KAMELETS=false"))
podFunc := OperatorPod(ns)
Eventually(podFunc).Should(Not(BeNil()))