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 795c38a6c7baa16d4b3fef98d84aa6278f923ae0 Author: phantomjinx <[email protected]> AuthorDate: Fri Nov 26 15:15:20 2021 +0000 Adds support for retaining test projects that failed --- .github/actions/e2e-builder/action.yml | 1 + .github/actions/e2e-knative-yaks/action.yml | 1 + .github/actions/e2e-knative/action.yml | 1 + .github/actions/e2e-kubernetes/action.yml | 2 ++ .github/actions/e2e-upgrade/action.yml | 1 + e2e/support/test_support.go | 6 ++++++ 6 files changed, 12 insertions(+) diff --git a/.github/actions/e2e-builder/action.yml b/.github/actions/e2e-builder/action.yml index 68f9311..caeff37 100644 --- a/.github/actions/e2e-builder/action.yml +++ b/.github/actions/e2e-builder/action.yml @@ -82,6 +82,7 @@ runs: export KAMEL_INSTALL_OPERATOR_IMAGE=${CUSTOM_IMAGE}:${CUSTOM_VERSION} export CAMEL_K_TEST_IMAGE_NAME=${CUSTOM_IMAGE} export CAMEL_K_TEST_IMAGE_VERSION=${CUSTOM_VERSION} + export CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE=${{ env.CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE }} # Then run integration tests make test-builder diff --git a/.github/actions/e2e-knative-yaks/action.yml b/.github/actions/e2e-knative-yaks/action.yml index e72e4ce..fc95dad 100644 --- a/.github/actions/e2e-knative-yaks/action.yml +++ b/.github/actions/e2e-knative-yaks/action.yml @@ -87,6 +87,7 @@ runs: # Test options export KAMEL_INSTALL_MAVEN_REPOSITORIES=$(make get-staging-repo) export KAMEL_INSTALL_OPERATOR_ENV_VARS=KAMEL_INSTALL_DEFAULT_KAMELETS=false + export CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE=${{ env.CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE }} # Install Yaks globally yaks install diff --git a/.github/actions/e2e-knative/action.yml b/.github/actions/e2e-knative/action.yml index 1c929d3..a1af033 100644 --- a/.github/actions/e2e-knative/action.yml +++ b/.github/actions/e2e-knative/action.yml @@ -84,6 +84,7 @@ runs: # Test options export KAMEL_INSTALL_MAVEN_REPOSITORIES=$(make get-staging-repo) export KAMEL_INSTALL_OPERATOR_ENV_VARS=KAMEL_INSTALL_DEFAULT_KAMELETS=false + export CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE=${{ env.CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE }} # Then run integration tests make test-knative diff --git a/.github/actions/e2e-kubernetes/action.yml b/.github/actions/e2e-kubernetes/action.yml index 4d290d6..c3ee22f 100644 --- a/.github/actions/e2e-kubernetes/action.yml +++ b/.github/actions/e2e-kubernetes/action.yml @@ -76,8 +76,10 @@ runs: export KAMEL_INSTALL_REGISTRY=${{ env.CLUSTER_IMAGE_REGISTRY_PULL_HOST }} export KAMEL_INSTALL_REGISTRY_INSECURE=${{ env.CLUSTER_IMAGE_REGISTRY_INSECURE }} export KAMEL_INSTALL_OPERATOR_IMAGE=${CUSTOM_IMAGE}:${CUSTOM_VERSION} + export CAMEL_K_TEST_IMAGE_NAME=${CUSTOM_IMAGE} export CAMEL_K_TEST_IMAGE_VERSION=${CUSTOM_VERSION} + export CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE=${{ env.CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE }} # Then run integration tests make test-integration diff --git a/.github/actions/e2e-upgrade/action.yml b/.github/actions/e2e-upgrade/action.yml index 9ea4ed8..1da7253 100644 --- a/.github/actions/e2e-upgrade/action.yml +++ b/.github/actions/e2e-upgrade/action.yml @@ -98,6 +98,7 @@ runs: export CAMEL_K_NEW_IIB=${{ env.BUILD_BUNDLE_LOCAL_IMAGE_BUNDLE_INDEX }} export KAMEL_K_TEST_RELEASE_VERSION=$(make get-last-released-version) export KAMEL_K_TEST_OPERATOR_CURRENT_IMAGE=${CUSTOM_IMAGE}:${CUSTOM_VERSION} + export CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE=${{ env.CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE }} # Then run integration tests make test-upgrade diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go index 436f5b4..25aab57 100644 --- a/e2e/support/test_support.go +++ b/e2e/support/test_support.go @@ -1728,6 +1728,12 @@ func DeleteKnativeBroker(ns metav1.Object) { } func DeleteTestNamespace(t *testing.T, ns ctrl.Object) { + value, saveNS := os.LookupEnv("CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE") + if t.Failed() && saveNS && value == "true" { + t.Logf("Warning: retaining failed test project %q", ns.GetName()) + return + } + var oc bool var err error if oc, err = openshift.IsOpenShift(TestClient()); err != nil {
