Skip to content

Commit 7b8e5e1

Browse files
committed
ci-operator/step-registry/openshift/e2e/test: Add TEST_COMMAND and TEST_SUITE
Taking advantage of openhsift/ci-tools@62e7498d66 (ci-operator multi-stage: add step parameters, 2020-05-27, openshift/ci-tools#854). This commit doesn't override the defaults yet, but a useful override would be: TEST_COMMAND=run-upgrade TEST_SUITE=all This replaces test-suite.txt, which landed in a2fd8c3 (step-registry: add Origin E2E test step, 2020-01-31, openshift#6965), and also had no consumers.
1 parent 63ad090 commit 7b8e5e1

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,7 @@ if [[ "${CLUSTER_TYPE}" == gcp ]]; then
6262
popd
6363
fi
6464

65-
test_suite=openshift/conformance/parallel
66-
if [[ -e "${SHARED_DIR}/test-suite.txt" ]]; then
67-
test_suite=$(<"${SHARED_DIR}/test-suite.txt")
68-
fi
69-
70-
openshift-tests run "${test_suite}" \
65+
openshift-tests "${TEST_COMMAND}" "${TEST_SUITE}" \
7166
--provider "${TEST_PROVIDER}" \
7267
-o /tmp/artifacts/e2e.log \
7368
--junit-dir /tmp/artifacts/junit

ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-ref.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ ref:
22
as: openshift-e2e-test
33
from: tests
44
commands: openshift-e2e-test-commands.sh
5+
env:
6+
- name: TEST_COMMAND
7+
default: run
8+
documentation: The test command to run. Use 'openshift-test --help' to list available commands.
9+
- name: TEST_SUITE
10+
default: openshift/conformance/parallel
11+
documentation: The test suite to run. Use 'openshift-test TEST_COMMAND --help' to list available suites.
512
resources:
613
requests:
714
cpu: "3"

0 commit comments

Comments
 (0)