From 62903c519a859b7525129841f5601c871537616a Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Thu, 15 Apr 2021 17:25:16 +0200 Subject: [PATCH] openshift-e2e-test: allow several upgrade targets If `override-upgrade` file exists from shared dir, use this string as target release. `openshift-tests` accepts comma-separated list of releases. This would enable support for chained upgrades (4.x -> 4.x + 1 -> 4.x.2) within a single test --- .../openshift/e2e/test/openshift-e2e-test-commands.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh index 873a051803bde..4b69d9b73f257 100755 --- a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh +++ b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh @@ -122,8 +122,13 @@ fi function upgrade() { set -x + TARGET_RELEASES="${OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE}" + if [[ -f "${SHARED_DIR}/override-upgrade" ]]; then + TARGET_RELEASES="$(< "${SHARED_DIR}/override-releases")" + echo "Overriding upgrade target to ${TARGET_RELEASES}" + fi openshift-tests run-upgrade all \ - --to-image "${OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE}" \ + --to-image "${TARGET_RELEASES}" \ --options "${TEST_UPGRADE_OPTIONS-}" \ --provider "${TEST_PROVIDER}" \ -o "${ARTIFACT_DIR}/e2e.log" \