Skip to content

Commit 8561f18

Browse files
committed
ci-operator/templates: Remove TEST_SUITE(_SERIAL)
The last consumer was removed in 7ea9239 (Change job focus for image-registry e2e, 2018-05-21, openshift#874). And the origin extended.test deprecated -suite in favor of focus in openshift/origin@83d9db89 (Make focus and skip a lot easier to use in extended tests, 2017-08-22, openshift/origin#15915).
1 parent 334748c commit 8561f18

4 files changed

+12
-20
lines changed

ci-operator/templates/cluster-launch-e2e-gmontero-testing.yaml

+4-6
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ parameters:
1818
required: true
1919
- name: CLUSTER_TYPE
2020
required: true
21-
- name: TEST_SUITE
2221
- name: TEST_FOCUS
2322
- name: TEST_SKIP
2423
value: "\\[local\\]"
25-
- name: TEST_SUITE_SERIAL
2624
- name: TEST_FOCUS_SERIAL
2725
- name: TEST_SKIP_SERIAL
2826
value: "\\[local\\]"
@@ -233,15 +231,15 @@ objects:
233231
# autodetected from the running cluster.
234232
# TODO: bump nodes up to 40 again
235233
set -x
236-
if [[ -n "${TEST_SUITE}" || -n "${TEST_FOCUS}" ]]; then
234+
if [[ -n "${TEST_FOCUS}" ]]; then
237235
ginkgo -v -noColor -nodes=30 $( which extended.test ) -- \
238-
-suite "${TEST_SUITE}" -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
236+
-ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
239237
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \
240238
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
241239
fi
242-
if [[ -n "${TEST_SUITE_SERIAL}" || -n "${TEST_FOCUS_SERIAL}" ]]; then
240+
if [[ -n "${TEST_FOCUS_SERIAL}" ]]; then
243241
ginkgo -v -noColor -nodes=1 $( which extended.test ) -- \
244-
-suite "${TEST_SUITE_SERIAL}" -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
242+
-ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
245243
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \
246244
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
247245
fi

ci-operator/templates/cluster-launch-e2e.yaml

+4-6
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ parameters:
1818
required: true
1919
- name: CLUSTER_TYPE
2020
required: true
21-
- name: TEST_SUITE
2221
- name: TEST_FOCUS
2322
- name: TEST_SKIP
2423
value: "\\[local\\]"
25-
- name: TEST_SUITE_SERIAL
2624
- name: TEST_FOCUS_SERIAL
2725
- name: TEST_SKIP_SERIAL
2826
value: "\\[local\\]"
@@ -149,15 +147,15 @@ objects:
149147
# autodetected from the running cluster.
150148
# TODO: bump nodes up to 40 again
151149
set -x
152-
if [[ -n "${TEST_SUITE}" || -n "${TEST_FOCUS}" ]]; then
150+
if [[ -n "${TEST_FOCUS}" ]]; then
153151
ginkgo -v -noColor -nodes=30 $( which extended.test ) -- \
154-
-suite "${TEST_SUITE}" -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
152+
-ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
155153
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \
156154
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
157155
fi
158-
if [[ -n "${TEST_SUITE_SERIAL}" || -n "${TEST_FOCUS_SERIAL}" ]]; then
156+
if [[ -n "${TEST_FOCUS_SERIAL}" ]]; then
159157
ginkgo -v -noColor -nodes=1 $( which extended.test ) -- \
160-
-suite "${TEST_SUITE_SERIAL}" -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
158+
-ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
161159
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \
162160
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
163161
fi

ci-operator/templates/cluster-launch-installer-e2e.yaml

+4-6
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ parameters:
1616
required: true
1717
- name: CLUSTER_TYPE
1818
required: true
19-
- name: TEST_SUITE
2019
- name: TEST_FOCUS
2120
- name: TEST_SKIP
22-
- name: TEST_SUITE_SERIAL
2321
- name: TEST_FOCUS_SERIAL
2422
- name: TEST_SKIP_SERIAL
2523

@@ -144,15 +142,15 @@ objects:
144142
# autodetected from the running cluster.
145143
# TODO: bump nodes up to 40 again
146144
set -x
147-
if [[ -n "${TEST_SUITE}" || -n "${TEST_FOCUS}" ]]; then
145+
if [[ -n "${TEST_FOCUS}" ]]; then
148146
ginkgo -v -noColor -nodes=30 $( which extended.test ) -- \
149-
-suite "${TEST_SUITE}" -ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
147+
-ginkgo.focus="${TEST_FOCUS}" -ginkgo.skip="${TEST_SKIP}" \
150148
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \
151149
-test.timeout=10m ${PROVIDER_ARGS-} || rc=$?
152150
fi
153-
if [[ -n "${TEST_SUITE_SERIAL}" || -n "${TEST_FOCUS_SERIAL}" ]]; then
151+
if [[ -n "${TEST_FOCUS_SERIAL}" ]]; then
154152
ginkgo -v -noColor -nodes=1 $( which extended.test ) -- \
155-
-suite "${TEST_SUITE_SERIAL}" -ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
153+
-ginkgo.focus="${TEST_FOCUS_SERIAL}" -ginkgo.skip="${TEST_SKIP_SERIAL}" \
156154
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \
157155
-test.timeout=20m ${PROVIDER_ARGS-} || rc=$?
158156
fi

ci-operator/templates/cluster-launch-src.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ parameters:
2020
required: true
2121
- name: CLUSTER_TYPE
2222
required: true
23-
- name: TEST_SUITE
2423
- name: TEST_FOCUS
2524
- name: TEST_SKIP
2625
value: "\\[local\\]"
27-
- name: TEST_SUITE_SERIAL
2826
- name: TEST_FOCUS_SERIAL
2927
- name: TEST_SKIP_SERIAL
3028
value: "\\[local\\]"

0 commit comments

Comments
 (0)