Skip to content

Commit 71042e1

Browse files
committed
Merge pull request kubernetes#13273 from quinton-hoole/2015-08-27-fix-flaky-test-config
Don't run flaky e2e tests in parallel test runs.
2 parents c9a8b2a + be1d01e commit 71042e1

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

hack/jenkins/e2e.sh

+2
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ case ${JOB_NAME} in
212212
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
213213
${GCE_PARALLEL_SKIP_TESTS[@]:+${GCE_PARALLEL_SKIP_TESTS[@]}} \
214214
${GCE_PARALLEL_FLAKY_TESTS[@]:+${GCE_PARALLEL_FLAKY_TESTS[@]}} \
215+
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
215216
)"}
216217
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-test-parallel"}
217218
: ${PROJECT:="kubernetes-jenkins"}
@@ -300,6 +301,7 @@ case ${JOB_NAME} in
300301
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
301302
${GCE_PARALLEL_SKIP_TESTS[@]:+${GCE_PARALLEL_SKIP_TESTS[@]}} \
302303
${GCE_PARALLEL_FLAKY_TESTS[@]:+${GCE_PARALLEL_FLAKY_TESTS[@]}} \
304+
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
303305
)"}
304306
: ${KUBE_GCE_INSTANCE_PREFIX:="pull-e2e-${EXECUTOR_NUMBER}"}
305307
: ${KUBE_GCS_STAGING_PATH_SUFFIX:="-${EXECUTOR_NUMBER}"}

0 commit comments

Comments
 (0)