github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19697 from gmarek/master

Browse Source 
Functionally revert #19381
This commit is contained in:
Marek Grabowski
2016-01-15 14:39:16 +01:00
parent b349a0c857 3a1463fea8
commit 5484bef6d3
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hack/jenkins/e2e.sh
View File

@@ -503,12 +503,7 @@ case ${JOB_NAME} in
kubernetes-e2e-gce-reboot) kubernetes-e2e-gce-reboot)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-reboot"} : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-reboot"}
: ${E2E_NETWORK:="e2e-reboot"} : ${E2E_NETWORK:="e2e-reboot"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=$(join_regex_allow_empty \ : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Reboot"}
${DISRUPTIVE_TESTS[@]:+${DISRUPTIVE_TESTS[@]}} \
) --ginkgo.skip=$(join_regex_no_empty \
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
)"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-reboot"} : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-reboot"}
: ${PROJECT:="kubernetes-jenkins"} : ${PROJECT:="kubernetes-jenkins"}
;; ;;