Merge pull request #18781 from jlowdermilk/gke-flaky

Auto commit by PR queue bot

Merge pull request #18781 from jlowdermilk/gke-flaky
0657a359 · k8s-merge-robot · 46c2df3e · f1cc2548 · 0657a359
Commit 0657a359 authored Dec 16, 2015 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

e2e.sh hack/jenkins/e2e.sh +4 -1

No files found.
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -688,8 +688,11 @@ case ${JOB_NAME} in
    : ${E2E_SET_CLUSTER_API_VERSION:=y}
    : ${PROJECT:="k8s-jkns-e2e-gke-ci-flaky"}
    : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
-    : ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_no_empty \
+    : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
+          ${GKE_REQUIRED_SKIP_TESTS[@]:+${GKE_REQUIRED_SKIP_TESTS[@]}}) \
+          --ginkgo.focus=$(join_regex_no_empty \
          ${GKE_FLAKY_TESTS[@]:+${GKE_FLAKY_TESTS[@]}} \
+          ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
          )"}
    ;;