github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14928 from mikedanese/upgrade

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-02 06:11:58 -07:00
commit 5d47e88e66
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/jenkins/e2e.sh
View File

@ -581,6 +581,7 @@ case ${JOB_NAME} in
: ${E2E_UP:="true"}
: ${E2E_TEST:="false"}
: ${E2E_DOWN:="false"}
NUM_MINIONS=3
;;
kubernetes-upgrade-gce-step2-upgrade)
@ -594,6 +595,7 @@ case ${JOB_NAME} in
: ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster"}
NUM_MINIONS=3
;;
kubernetes-upgrade-gce-step3-e2e)
@ -611,6 +613,7 @@ case ${JOB_NAME} in
${GCE_PARALLEL_FLAKY_TESTS[@]:+${GCE_PARALLEL_FLAKY_TESTS[@]}} \
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
)"}
NUM_MINIONS=3
;;
kubernetes-kubemark-gce)