Skip to content

ci-operator/templates: Remove TEST_SUITE(_SERIAL) #1261

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
Aug 31, 2018
Merged

ci-operator/templates: Remove TEST_SUITE(_SERIAL) #1261

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
10 changes: 4 additions & 6 deletions ci-operator/templates/cluster-launch-e2e-gmontero-testing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ parameters:
required: true
- name: CLUSTER_TYPE
required: true
- name: TEST_SUITE
- name: TEST_FOCUS
- name: TEST_SKIP
value: "\\[local\\]"
- name: TEST_SUITE_SERIAL
- name: TEST_FOCUS_SERIAL
- name: TEST_SKIP_SERIAL
value: "\\[local\\]"
Expand Down Expand Up @@ -233,15 +231,15 @@ objects:
# autodetected from the running cluster.
# TODO: bump nodes up to 40 again
set -x
if [[ -n "${TEST_SUITE}" || -n "${TEST_FOCUS}" ]]; then
if [[ -n "${TEST_FOCUS}" ]]; then
ginkgo -v -noColor -nodes=30 $( which extended.test ) -- \
-suite "${TEST_SUITE}" -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
-ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
fi
if [[ -n "${TEST_SUITE_SERIAL}" || -n "${TEST_FOCUS_SERIAL}" ]]; then
if [[ -n "${TEST_FOCUS_SERIAL}" ]]; then
ginkgo -v -noColor -nodes=1 $( which extended.test ) -- \
-suite "${TEST_SUITE_SERIAL}" -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
-ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
fi
Expand Down
10 changes: 4 additions & 6 deletions ci-operator/templates/cluster-launch-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ parameters:
required: true
- name: CLUSTER_TYPE
required: true
- name: TEST_SUITE
- name: TEST_FOCUS
- name: TEST_SKIP
value: "\\[local\\]"
- name: TEST_SUITE_SERIAL
- name: TEST_FOCUS_SERIAL
- name: TEST_SKIP_SERIAL
value: "\\[local\\]"
Expand Down Expand Up @@ -149,15 +147,15 @@ objects:
# autodetected from the running cluster.
# TODO: bump nodes up to 40 again
set -x
if [[ -n "${TEST_SUITE}" || -n "${TEST_FOCUS}" ]]; then
if [[ -n "${TEST_FOCUS}" ]]; then
ginkgo -v -noColor -nodes=30 $( which extended.test ) -- \
-suite "${TEST_SUITE}" -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
-ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
fi
if [[ -n "${TEST_SUITE_SERIAL}" || -n "${TEST_FOCUS_SERIAL}" ]]; then
if [[ -n "${TEST_FOCUS_SERIAL}" ]]; then
ginkgo -v -noColor -nodes=1 $( which extended.test ) -- \
-suite "${TEST_SUITE_SERIAL}" -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
-ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
fi
Expand Down
10 changes: 4 additions & 6 deletions ci-operator/templates/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ parameters:
required: true
- name: CLUSTER_TYPE
required: true
- name: TEST_SUITE
- name: TEST_FOCUS
- name: TEST_SKIP
- name: TEST_SUITE_SERIAL
- name: TEST_FOCUS_SERIAL
- name: TEST_SKIP_SERIAL

Expand Down Expand Up @@ -144,15 +142,15 @@ objects:
# autodetected from the running cluster.
# TODO: bump nodes up to 40 again
set -x
if [[ -n "${TEST_SUITE}" || -n "${TEST_FOCUS}" ]]; then
if [[ -n "${TEST_FOCUS}" ]]; then
ginkgo -v -noColor -nodes=30 $( which extended.test ) -- \
-suite "${TEST_SUITE}" -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
-ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \
-test.timeout=10m ${PROVIDER_ARGS-} || rc=$?
fi
if [[ -n "${TEST_SUITE_SERIAL}" || -n "${TEST_FOCUS_SERIAL}" ]]; then
if [[ -n "${TEST_FOCUS_SERIAL}" ]]; then
ginkgo -v -noColor -nodes=1 $( which extended.test ) -- \
-suite "${TEST_SUITE_SERIAL}" -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
-ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \
-test.timeout=20m ${PROVIDER_ARGS-} || rc=$?
fi
Expand Down
2 changes: 0 additions & 2 deletions ci-operator/templates/cluster-launch-src.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@ parameters:
required: true
- name: CLUSTER_TYPE
required: true
- name: TEST_SUITE
- name: TEST_FOCUS
- name: TEST_SKIP
value: "\\[local\\]"
- name: TEST_SUITE_SERIAL
- name: TEST_FOCUS_SERIAL
- name: TEST_SKIP_SERIAL
value: "\\[local\\]"
Expand Down