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 fb172cc4a3d3e52f482c9a136666f4cdc4bd9777
Author: Christoph Deppisch <cdeppi...@redhat.com>
AuthorDate: Mon Jul 4 23:31:22 2022 +0200
fix(#2177): Fix preflight test script and e2e upgrade tests
---
.github/actions/kamel-preflight-test/preflight-test.sh | 11 +----------
.github/workflows/upgrade.yml | 2 +-
e2e/namespace/upgrade/cli_upgrade_test.go | 2 +-
e2e/namespace/upgrade/olm_upgrade_test.go | 2 +-
4 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/.github/actions/kamel-preflight-test/preflight-test.sh
b/.github/actions/kamel-preflight-test/preflight-test.sh
index ead05e1d7..de9a6c911 100755
--- a/.github/actions/kamel-preflight-test/preflight-test.sh
+++ b/.github/actions/kamel-preflight-test/preflight-test.sh
@@ -200,7 +200,7 @@ export KAMEL_INSTALL_OPERATOR_IMAGE_PULL_POLICY="Always"
#
# Install the operator to local namespace
#
-kamel install -n ${NAMESPACE} --olm=${has_olm} --global=false
--operator-id=camel-k-preflight
+kamel install -n ${NAMESPACE} --olm=${has_olm} --operator-id=camel-k-preflight
if [ $? != 0 ]; then
echo "Error: kamel install returned an error."
delns "${NAMESPACE}"
@@ -284,15 +284,6 @@ if [ $? != 0 ]; then
exit 1
fi
-#
-# Remove the operator from local namespace
-#
-kamel uninstall -n ${NAMESPACE}
-if [ $? != 0 ]; then
- echo "Error: kamel uninstall returned an error."
- exit 1
-fi
-
sleep 3
echo "Preflight Test: Success"
diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml
index ce1dffaa9..09eec212a 100644
--- a/.github/workflows/upgrade.yml
+++ b/.github/workflows/upgrade.yml
@@ -50,7 +50,7 @@ on:
skip-problematic:
description: 'Whether tests marked as problematic should be skipped -
false by default (sets CAMEL_K_TEST_SKIP_PROBLEMATIC)'
required: false
- default: false
+ default: "false"
test-filters:
description: |
Filter the tests in this test suite by assigning the test pattern to
TEST_UPGRADE_RUN,
diff --git a/e2e/namespace/upgrade/cli_upgrade_test.go
b/e2e/namespace/upgrade/cli_upgrade_test.go
index 4c849cee4..7e9b35d23 100644
--- a/e2e/namespace/upgrade/cli_upgrade_test.go
+++ b/e2e/namespace/upgrade/cli_upgrade_test.go
@@ -64,7 +64,7 @@ func TestOperatorUpgrade(t *testing.T) {
// Run the Integration
name := "yaml"
- Expect(KamelRun(ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(Kamel("run", "-n", ns,
"files/yaml.yaml").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, name),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, name,
v1.IntegrationConditionReady),
TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
diff --git a/e2e/namespace/upgrade/olm_upgrade_test.go
b/e2e/namespace/upgrade/olm_upgrade_test.go
index cdcc5ef55..b6037a4f5 100644
--- a/e2e/namespace/upgrade/olm_upgrade_test.go
+++ b/e2e/namespace/upgrade/olm_upgrade_test.go
@@ -107,7 +107,7 @@ func TestOLMAutomaticUpgrade(t *testing.T) {
Eventually(PlatformVersion(ns)).Should(ContainSubstring(prevIPVersionPrefix))
name := "yaml"
- Expect(KamelRun(ns, "files/yaml.yaml").Execute()).To(Succeed())
+ Expect(Kamel("run", "-n", ns,
"files/yaml.yaml").Execute()).To(Succeed())
// Check the Integration runs correctly
Eventually(IntegrationPodPhase(ns, name),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, name,
v1.IntegrationConditionReady),
TestTimeoutLong).Should(Equal(corev1.ConditionTrue))
