You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2021/05/11 16:41:14 UTC
[camel-k] 04/04: chore(e2e): Remove CRDs after OLM uninstall
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b98424a1fc19ee5a9f4f1cb4e2ba0ce106b9bf4d
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Tue May 11 15:15:37 2021 +0200
chore(e2e): Remove CRDs after OLM uninstall
---
e2e/upgrade/cli_upgrade_test.go | 3 ---
e2e/upgrade/olm_upgrade_test.go | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/e2e/upgrade/cli_upgrade_test.go b/e2e/upgrade/cli_upgrade_test.go
index 095943e..55bed82 100644
--- a/e2e/upgrade/cli_upgrade_test.go
+++ b/e2e/upgrade/cli_upgrade_test.go
@@ -36,9 +36,6 @@ import (
)
func TestOperatorUpgrade(t *testing.T) {
- // Clean all cluster-wide resources that could corrupt the test run
- Expect(Kamel("uninstall", "--all", "--olm=false").Execute()).To(Succeed())
-
WithNewTestNamespace(t, func(ns string) {
version, ok := os.LookupEnv("KAMEL_K_TEST_RELEASE_VERSION")
Expect(ok).To(BeTrue())
diff --git a/e2e/upgrade/olm_upgrade_test.go b/e2e/upgrade/olm_upgrade_test.go
index 21f6237..3a3bc8d 100644
--- a/e2e/upgrade/olm_upgrade_test.go
+++ b/e2e/upgrade/olm_upgrade_test.go
@@ -142,6 +142,8 @@ func TestOLMAutomaticUpgrade(t *testing.T) {
// Clean up
Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
Expect(Kamel("uninstall", "-n", ns).Execute()).To(Succeed())
+ // Clean up cluster-wide resources that are not removed by OLM
+ Expect(Kamel("uninstall", "--all", "--olm=false").Execute()).To(Succeed())
})
})
}