From 7b8e5e1e15fc1bb58de5c61527d072e0e3793e51 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@tremily.us>
Date: Mon, 15 Jun 2020 20:05:23 -0700
Subject: [PATCH] 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 a2fd8c3bfb
(step-registry: add Origin E2E test step, 2020-01-31, #6965), and also
had no consumers.
---
 .../openshift/e2e/test/openshift-e2e-test-commands.sh      | 7 +------
 .../openshift/e2e/test/openshift-e2e-test-ref.yaml         | 7 +++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

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 c641265e03fd1..c52d7693b8129 100644
--- 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
@@ -62,12 +62,7 @@ if [[ "${CLUSTER_TYPE}" == gcp ]]; then
     popd
 fi
 
-test_suite=openshift/conformance/parallel
-if [[ -e "${SHARED_DIR}/test-suite.txt" ]]; then
-    test_suite=$(<"${SHARED_DIR}/test-suite.txt")
-fi
-
-openshift-tests run "${test_suite}" \
+openshift-tests "${TEST_COMMAND}" "${TEST_SUITE}" \
     --provider "${TEST_PROVIDER}" \
     -o /tmp/artifacts/e2e.log \
     --junit-dir /tmp/artifacts/junit
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 60329d4e34d8a..918c0054c701a 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
@@ -2,6 +2,13 @@ ref:
   as: openshift-e2e-test
   from: tests
   commands: openshift-e2e-test-commands.sh
+  env:
+  - name: TEST_COMMAND
+    default: run
+    documentation: The test command to run.  Use 'openshift-test --help' to list available commands.
+  - name: TEST_SUITE
+    default: openshift/conformance/parallel
+    documentation: The test suite to run.  Use 'openshift-test TEST_COMMAND --help' to list available suites.
   resources:
     requests:
       cpu: "3"