github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16691 from mikedanese/fix-e2e 

rename enable var to correct name and only use it when needed
pull/6/head
Mike Danese 2015-11-02 15:57:08 -08:00
parent 08a7ffb299 5e64590f4a
commit f64f2a7302
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hack/jenkins/e2e.sh
View File

@ -937,8 +937,6 @@ case ${JOB_NAME} in
: ${E2E_TEST:="false"}
: ${E2E_DOWN:="false"}
: ${NUM_MINIONS:=5}
: ${ENABLE_DEPLOYMENTS:=true}
: ${ENABLE_DAEMONSETS:=true}
;;
kubernetes-upgrade-gce-step2-upgrade-master)
@ -952,8 +950,8 @@ case ${JOB_NAME} in
: ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master"}
: ${NUM_MINIONS:=5}
: ${ENABLE_DEPLOYMENTS:=true}
: ${ENABLE_DAEMONSETS:=true}
: ${KUBE_ENABLE_DEPLOYMENTS:=true}
: ${KUBE_ENABLE_DAEMONSETS:=true}
;;
kubernetes-upgrade-gce-step3-e2e-old)
@ -974,8 +972,6 @@ case ${JOB_NAME} in
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
)"}
: ${NUM_MINIONS:=5}
: ${ENABLE_DEPLOYMENTS:=true}
: ${ENABLE_DAEMONSETS:=true}
;;
kubernetes-upgrade-gce-step4-upgrade-cluster)
@ -989,8 +985,8 @@ case ${JOB_NAME} in
: ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster"}
: ${NUM_MINIONS:=5}
: ${ENABLE_DEPLOYMENTS:=true}
: ${ENABLE_DAEMONSETS:=true}
: ${KUBE_ENABLE_DEPLOYMENTS:=true}
: ${KUBE_ENABLE_DAEMONSETS:=true}
;;
kubernetes-upgrade-gce-step5-e2e-old)
@ -1009,8 +1005,6 @@ case ${JOB_NAME} in
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
)"}
: ${NUM_MINIONS:=5}
: ${ENABLE_DEPLOYMENTS:=true}
: ${ENABLE_DAEMONSETS:=true}
;;
kubernetes-upgrade-gce-step6-e2e-new)
@ -1030,8 +1024,6 @@ case ${JOB_NAME} in
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
)"}
: ${NUM_MINIONS:=5}
: ${ENABLE_DEPLOYMENTS:=true}
: ${ENABLE_DAEMONSETS:=true}
;;
# kubernetes-upgrade-gce-1.0-1.1
@ -1055,8 +1047,6 @@ case ${JOB_NAME} in
: ${E2E_DOWN:="false"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
: ${NUM_MINIONS:=5}
: ${ENABLE_DEPLOYMENTS:=true}
: ${ENABLE_DAEMONSETS:=true}
;;
kubernetes-upgrade-1.0-1.1-gce-step2-upgrade-master)
@ -1073,8 +1063,8 @@ case ${JOB_NAME} in
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master --upgrade-target=ci/latest-1.1"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
: ${NUM_MINIONS:=5}
: ${ENABLE_DEPLOYMENTS:=true}
: ${ENABLE_DAEMONSETS:=true}
: ${KUBE_ENABLE_DEPLOYMENTS:=true}
: ${KUBE_ENABLE_DAEMONSETS:=true}
;;
kubernetes-upgrade-1.0-1.1-gce-step3-e2e-old)
@ -1094,8 +1084,6 @@ case ${JOB_NAME} in
)"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
: ${NUM_MINIONS:=5}
: ${ENABLE_DEPLOYMENTS:=true}
: ${ENABLE_DAEMONSETS:=true}
;;
kubernetes-upgrade-1.0-1.1-gce-step4-upgrade-cluster)
@ -1112,8 +1100,8 @@ case ${JOB_NAME} in
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster --upgrade-target=ci/latest-1.1"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
: ${NUM_MINIONS:=5}
: ${ENABLE_DEPLOYMENTS:=true}
: ${ENABLE_DAEMONSETS:=true}
: ${KUBE_ENABLE_DEPLOYMENTS:=true}
: ${KUBE_ENABLE_DAEMONSETS:=true}
;;
kubernetes-upgrade-1.0-1.1-gce-step5-e2e-old)
@ -1133,8 +1121,6 @@ case ${JOB_NAME} in
)"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
: ${NUM_MINIONS:=5}
: ${ENABLE_DEPLOYMENTS:=true}
: ${ENABLE_DAEMONSETS:=true}
;;
kubernetes-upgrade-1.0-1.1-gce-step6-e2e-new)
@ -1156,8 +1142,6 @@ case ${JOB_NAME} in
)"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
: ${NUM_MINIONS:=5}
: ${ENABLE_DEPLOYMENTS:=true}
: ${ENABLE_DAEMONSETS:=true}
;;
# Run Kubemark test on a fake 100 node cluster to have a comparison