From e64ef016385a9f9517eb3eb8fa2e5223ae66caa7 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 16 Apr 2021 11:12:57 +0200 Subject: [PATCH] openshift-e2e-test: set TEST_UPGRADE_SUITE Default upgrade test suite is "all", but some tests (like SNO) might want to have "platform" or "none" set --- .../openshift/e2e/test/openshift-e2e-test-commands.sh | 2 +- .../openshift/e2e/test/openshift-e2e-test-ref.yaml | 3 +++ 2 files changed, 4 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 4b69d9b73f257..d0c07bee9e38a 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 @@ -127,7 +127,7 @@ function upgrade() { TARGET_RELEASES="$(< "${SHARED_DIR}/override-releases")" echo "Overriding upgrade target to ${TARGET_RELEASES}" fi - openshift-tests run-upgrade all \ + openshift-tests run-upgrade "${TEST_UPGRADE_SUITE}" \ --to-image "${TARGET_RELEASES}" \ --options "${TEST_UPGRADE_OPTIONS-}" \ --provider "${TEST_PROVIDER}" \ diff --git a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-ref.yaml b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-ref.yaml index 4e7d5e7d5f907..ba0b4a1063120 100644 --- a/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-ref.yaml +++ b/ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-ref.yaml @@ -28,6 +28,9 @@ ref: - name: TEST_SUITE default: openshift/conformance/parallel documentation: The test suite to run. Use 'openshift-test run --help' to list available suites. + - name: TEST_UPGRADE_SUITE + default: all + documentation: The test suite to run in upgrade tests. Use 'openshift-test run --help' to list available suites. - name: TEST_SKIPS default: "" documentation: Regular expression (POSIX basic regular expression) of tests to skip.