From f1cc2548fbd9d07c9909e1b8a6013d19a8f17a4b Mon Sep 17 00:00:00 2001
From: Jeff Lowdermilk <jeffml@google.com>
Date: Wed, 16 Dec 2015 11:59:31 -0800
Subject: [PATCH] Make gke-flaky test more useful

Test gce flaky tests as well, so the job isn't skipping all but
one test.
---
 hack/jenkins/e2e.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index 6eb3fd0f325..0e79e9f4c94 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -692,8 +692,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[@]}} \
           )"}
     ;;