Skip to content

ci-operator/step-registry/openshift/e2e/test: Add TEST_COMMAND and TEST_SUITE #9676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jun 16, 2020
Merged

ci-operator/step-registry/openshift/e2e/test: Add TEST_COMMAND and TEST_SUITE #9676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 7 additions & 0 deletions ci-operator/step-registry/openshift/e2e/test/openshift-e2e-test-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ ref:
as: openshift-e2e-test
from: tests
commands: openshift-e2e-test-commands.sh
env:
- name: TEST_COMMAND
Copy link
Contributor

@smarterclayton smarterclayton Jun 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This unfortunately doesn’t solve the common “run a type of suite like upgrade and then run the normal suite”.

I would recommend not abstracting the test command into multiple steps, just accept a test command like we do in CI chunks today. I don’t think this is going to address our needs well.

Copy link
Member Author

@wking wking Jun 19, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries, we can still iterate ;)

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"
Expand Down