File tree 4 files changed +12
-20
lines changed
4 files changed +12
-20
lines changed Original file line number Diff line number Diff line change @@ -18,11 +18,9 @@ parameters:
18
18
required : true
19
19
- name : CLUSTER_TYPE
20
20
required : true
21
- - name : TEST_SUITE
22
21
- name : TEST_FOCUS
23
22
- name : TEST_SKIP
24
23
value : " \\ [local\\ ]"
25
- - name : TEST_SUITE_SERIAL
26
24
- name : TEST_FOCUS_SERIAL
27
25
- name : TEST_SKIP_SERIAL
28
26
value : " \\ [local\\ ]"
@@ -233,15 +231,15 @@ objects:
233
231
# autodetected from the running cluster.
234
232
# TODO: bump nodes up to 40 again
235
233
set -x
236
- if [[ -n "${TEST_SUITE}" || -n "${ TEST_FOCUS}" ]]; then
234
+ if [[ -n "${TEST_FOCUS}" ]]; then
237
235
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}" \
239
237
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \
240
238
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
241
239
fi
242
- if [[ -n "${TEST_SUITE_SERIAL}" || -n "${ TEST_FOCUS_SERIAL}" ]]; then
240
+ if [[ -n "${TEST_FOCUS_SERIAL}" ]]; then
243
241
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}" \
245
243
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \
246
244
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
247
245
fi
Original file line number Diff line number Diff line change @@ -18,11 +18,9 @@ parameters:
18
18
required : true
19
19
- name : CLUSTER_TYPE
20
20
required : true
21
- - name : TEST_SUITE
22
21
- name : TEST_FOCUS
23
22
- name : TEST_SKIP
24
23
value : " \\ [local\\ ]"
25
- - name : TEST_SUITE_SERIAL
26
24
- name : TEST_FOCUS_SERIAL
27
25
- name : TEST_SKIP_SERIAL
28
26
value : " \\ [local\\ ]"
@@ -149,15 +147,15 @@ objects:
149
147
# autodetected from the running cluster.
150
148
# TODO: bump nodes up to 40 again
151
149
set -x
152
- if [[ -n "${TEST_SUITE}" || -n "${ TEST_FOCUS}" ]]; then
150
+ if [[ -n "${TEST_FOCUS}" ]]; then
153
151
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}" \
155
153
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \
156
154
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
157
155
fi
158
- if [[ -n "${TEST_SUITE_SERIAL}" || -n "${ TEST_FOCUS_SERIAL}" ]]; then
156
+ if [[ -n "${TEST_FOCUS_SERIAL}" ]]; then
159
157
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}" \
161
159
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \
162
160
-test.timeout=2h ${PROVIDER_ARGS-} || rc=$?
163
161
fi
Original file line number Diff line number Diff line change @@ -16,10 +16,8 @@ parameters:
16
16
required : true
17
17
- name : CLUSTER_TYPE
18
18
required : true
19
- - name : TEST_SUITE
20
19
- name : TEST_FOCUS
21
20
- name : TEST_SKIP
22
- - name : TEST_SUITE_SERIAL
23
21
- name : TEST_FOCUS_SERIAL
24
22
- name : TEST_SKIP_SERIAL
25
23
@@ -144,15 +142,15 @@ objects:
144
142
# autodetected from the running cluster.
145
143
# TODO: bump nodes up to 40 again
146
144
set -x
147
- if [[ -n "${TEST_SUITE}" || -n "${ TEST_FOCUS}" ]]; then
145
+ if [[ -n "${TEST_FOCUS}" ]]; then
148
146
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}" \
150
148
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit \
151
149
-test.timeout=10m ${PROVIDER_ARGS-} || rc=$?
152
150
fi
153
- if [[ -n "${TEST_SUITE_SERIAL}" || -n "${ TEST_FOCUS_SERIAL}" ]]; then
151
+ if [[ -n "${TEST_FOCUS_SERIAL}" ]]; then
154
152
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}" \
156
154
-e2e-output-dir /tmp/artifacts -report-dir /tmp/artifacts/junit/serial \
157
155
-test.timeout=20m ${PROVIDER_ARGS-} || rc=$?
158
156
fi
Original file line number Diff line number Diff line change @@ -20,11 +20,9 @@ parameters:
20
20
required : true
21
21
- name : CLUSTER_TYPE
22
22
required : true
23
- - name : TEST_SUITE
24
23
- name : TEST_FOCUS
25
24
- name : TEST_SKIP
26
25
value : " \\ [local\\ ]"
27
- - name : TEST_SUITE_SERIAL
28
26
- name : TEST_FOCUS_SERIAL
29
27
- name : TEST_SKIP_SERIAL
30
28
value : " \\ [local\\ ]"
You can’t perform that action at this time.
0 commit comments