From dc7b4d526610d1c4639f1350299366c1b86e6eae Mon Sep 17 00:00:00 2001 From: Parthvi Vala Date: Thu, 6 Apr 2023 18:57:37 +0530 Subject: [PATCH 1/2] Revert "Add DEVFILE_REGISTRY env var for periodic tests (#6709)" This reverts commit f0bf9ee1dd86eba0c6917f0b857ea5840d9bb314. --- scripts/openshiftci-Nightly-SBO-tests.sh | 2 -- scripts/openshiftci-config.sh | 1 - scripts/openshiftci-periodic-tests.sh | 2 -- scripts/openshiftci-presubmit-all-tests.sh | 2 -- 4 files changed, 7 deletions(-) delete mode 100644 scripts/openshiftci-config.sh diff --git a/scripts/openshiftci-Nightly-SBO-tests.sh b/scripts/openshiftci-Nightly-SBO-tests.sh index 200a46c0c38..366e8b24f1a 100755 --- a/scripts/openshiftci-Nightly-SBO-tests.sh +++ b/scripts/openshiftci-Nightly-SBO-tests.sh @@ -27,8 +27,6 @@ oc login -u developer -p password@123 --insecure-skip-tls-verify # Check login user name for debugging purpose oc whoami -source ./scripts/openshiftci-config.sh - # Operatorhub integration tests make test-integration make test-e2e diff --git a/scripts/openshiftci-config.sh b/scripts/openshiftci-config.sh deleted file mode 100644 index 0f3c8cfcd11..00000000000 --- a/scripts/openshiftci-config.sh +++ /dev/null @@ -1 +0,0 @@ -export DEVFILE_REGISTRY=https://devfile-registry-ci-devfile-registry.odo-test-kubernetes-clust-49529fc6e6a4a9fe7ebba9a3db5b55c4-0000.eu-de.containers.appdomain.cloud/ diff --git a/scripts/openshiftci-periodic-tests.sh b/scripts/openshiftci-periodic-tests.sh index 5b4b66bfe49..0be5bba7ead 100755 --- a/scripts/openshiftci-periodic-tests.sh +++ b/scripts/openshiftci-periodic-tests.sh @@ -26,8 +26,6 @@ oc login -u developer -p password@123 --insecure-skip-tls-verify # Check login user name for debugging purpose oc whoami -source ./scripts/openshiftci-config.sh - # Integration tests make test-integration || error=true diff --git a/scripts/openshiftci-presubmit-all-tests.sh b/scripts/openshiftci-presubmit-all-tests.sh index 48707530018..a0e7f733283 100755 --- a/scripts/openshiftci-presubmit-all-tests.sh +++ b/scripts/openshiftci-presubmit-all-tests.sh @@ -32,8 +32,6 @@ oc login -u developer -p password@123 --insecure-skip-tls-verify # Check login user name for debugging purpose oc whoami -source ./scripts/openshiftci-config.sh - if [ "${ARCH}" == "s390x" ]; then # Integration tests make test-integration From a4527aa2e68721717e7cabd30d9c4a75870c183f Mon Sep 17 00:00:00 2001 From: Parthvi Vala Date: Wed, 12 Apr 2023 14:20:56 +0530 Subject: [PATCH 2/2] Use IBM Devfile registry for InterOP testing Signed-off-by: Parthvi Vala --- scripts/openshiftci-config.sh | 1 + scripts/openshiftci-presubmit-all-tests.sh | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 scripts/openshiftci-config.sh diff --git a/scripts/openshiftci-config.sh b/scripts/openshiftci-config.sh new file mode 100644 index 00000000000..0f3c8cfcd11 --- /dev/null +++ b/scripts/openshiftci-config.sh @@ -0,0 +1 @@ +export DEVFILE_REGISTRY=https://devfile-registry-ci-devfile-registry.odo-test-kubernetes-clust-49529fc6e6a4a9fe7ebba9a3db5b55c4-0000.eu-de.containers.appdomain.cloud/ diff --git a/scripts/openshiftci-presubmit-all-tests.sh b/scripts/openshiftci-presubmit-all-tests.sh index a0e7f733283..cc43c8ab419 100755 --- a/scripts/openshiftci-presubmit-all-tests.sh +++ b/scripts/openshiftci-presubmit-all-tests.sh @@ -1,5 +1,7 @@ #!/bin/sh +# This file is used for InterOP testing, i.e. testing odo with unreleased OpenShift versions. + # fail if some commands fails set -e # show commands @@ -32,6 +34,8 @@ oc login -u developer -p password@123 --insecure-skip-tls-verify # Check login user name for debugging purpose oc whoami +# We want to use a stable Devfile registry for InterOP testing, and so we use the custom Devfile Registry setup on IBM cloud +source ./scripts/openshiftci-config.sh if [ "${ARCH}" == "s390x" ]; then # Integration tests make test-integration