mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 05:27:21 +00:00
Merge pull request #15871 from mikedanese/upgrade-gce-1-to-11
Auto commit by PR queue bot
This commit is contained in:
commit
345cda76b3
@ -839,6 +839,124 @@ case ${JOB_NAME} in
|
|||||||
: ${NUM_MINIONS:=5}
|
: ${NUM_MINIONS:=5}
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
# kubernetes-upgrade-gce-1.0-1.1
|
||||||
|
#
|
||||||
|
# This suite:
|
||||||
|
#
|
||||||
|
# 1. launches a cluster at release/latest-1.0,
|
||||||
|
# 2. upgrades the master to ci/latest-1.1
|
||||||
|
# 3. runs release/latest-1.0 e2es,
|
||||||
|
# 4. upgrades the rest of the cluster,
|
||||||
|
# 5. runs release/latest-1.0 e2es again, then
|
||||||
|
# 6. runs ci/latest-1.1 e2es and tears down the cluster.
|
||||||
|
|
||||||
|
kubernetes-upgrade-1.0-1.1-gce-step1-deploy)
|
||||||
|
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
|
||||||
|
: ${E2E_NETWORK:="gce-upgrade-1-0"}
|
||||||
|
: ${JENKINS_PUBLISHED_VERSION:="release/latest-1.0"}
|
||||||
|
: ${PROJECT:="k8s-jkns-gce-upgrade"}
|
||||||
|
: ${E2E_UP:="true"}
|
||||||
|
: ${E2E_TEST:="false"}
|
||||||
|
: ${E2E_DOWN:="false"}
|
||||||
|
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
|
||||||
|
: ${ENABLE_EXPERIMENTAL_API:=true}
|
||||||
|
: ${NUM_MINIONS:=5}
|
||||||
|
;;
|
||||||
|
|
||||||
|
kubernetes-upgrade-1.0-1.1-gce-step2-upgrade-master)
|
||||||
|
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
|
||||||
|
: ${E2E_NETWORK:="gce-upgrade-1-0"}
|
||||||
|
: ${E2E_OPT:="--check_version_skew=false"}
|
||||||
|
# We have to get tars at ci/latest (JENKINS_PUBLISHED_VERSION default) to
|
||||||
|
# get the latest upgrade logic.
|
||||||
|
: ${JENKINS_FORCE_GET_TARS:=y}
|
||||||
|
: ${PROJECT:="k8s-jkns-gce-upgrade"}
|
||||||
|
: ${E2E_UP:="false"}
|
||||||
|
: ${E2E_TEST:="true"}
|
||||||
|
: ${E2E_DOWN:="false"}
|
||||||
|
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master --upgrade-target=ci/latest-1.1"}
|
||||||
|
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
|
||||||
|
: ${ENABLE_EXPERIMENTAL_API:=true}
|
||||||
|
: ${NUM_MINIONS:=5}
|
||||||
|
;;
|
||||||
|
|
||||||
|
kubernetes-upgrade-1.0-1.1-gce-step3-e2e-old)
|
||||||
|
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
|
||||||
|
: ${E2E_NETWORK:="gce-upgrade-1-0"}
|
||||||
|
: ${E2E_OPT:="--check_version_skew=false"}
|
||||||
|
: ${JENKINS_FORCE_GET_TARS:=y}
|
||||||
|
# Run old e2es
|
||||||
|
: ${JENKINS_PUBLISHED_VERSION:="release/latest-1.0"}
|
||||||
|
: ${PROJECT:="k8s-jkns-gce-upgrade"}
|
||||||
|
: ${E2E_UP:="false"}
|
||||||
|
: ${E2E_TEST:="true"}
|
||||||
|
: ${E2E_DOWN:="false"}
|
||||||
|
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
|
||||||
|
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
|
||||||
|
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
|
||||||
|
)"}
|
||||||
|
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
|
||||||
|
: ${ENABLE_EXPERIMENTAL_API:=true}
|
||||||
|
: ${NUM_MINIONS:=5}
|
||||||
|
;;
|
||||||
|
|
||||||
|
kubernetes-upgrade-1.0-1.1-gce-step4-upgrade-cluster)
|
||||||
|
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
|
||||||
|
: ${E2E_NETWORK:="gce-upgrade-1-0"}
|
||||||
|
: ${E2E_OPT:="--check_version_skew=false"}
|
||||||
|
# We have to get tars at ci/latest (JENKINS_PUBLISHED_VERSION default) to
|
||||||
|
# get the latest upgrade logic.
|
||||||
|
: ${JENKINS_FORCE_GET_TARS:=y}
|
||||||
|
: ${PROJECT:="k8s-jkns-gce-upgrade"}
|
||||||
|
: ${E2E_UP:="false"}
|
||||||
|
: ${E2E_TEST:="true"}
|
||||||
|
: ${E2E_DOWN:="false"}
|
||||||
|
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster --upgrade-target=ci/latest-1.1"}
|
||||||
|
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
|
||||||
|
: ${ENABLE_EXPERIMENTAL_API:=true}
|
||||||
|
: ${NUM_MINIONS:=5}
|
||||||
|
;;
|
||||||
|
|
||||||
|
kubernetes-upgrade-1.0-1.1-gce-step5-e2e-old)
|
||||||
|
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
|
||||||
|
: ${E2E_NETWORK:="gce-upgrade-1-0"}
|
||||||
|
: ${E2E_OPT:="--check_version_skew=false"}
|
||||||
|
: ${JENKINS_FORCE_GET_TARS:=y}
|
||||||
|
# Run old e2es
|
||||||
|
: ${JENKINS_PUBLISHED_VERSION:="release/latest-1.0"}
|
||||||
|
: ${PROJECT:="k8s-jkns-gce-upgrade"}
|
||||||
|
: ${E2E_UP:="false"}
|
||||||
|
: ${E2E_TEST:="true"}
|
||||||
|
: ${E2E_DOWN:="false"}
|
||||||
|
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
|
||||||
|
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
|
||||||
|
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
|
||||||
|
)"}
|
||||||
|
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
|
||||||
|
: ${ENABLE_EXPERIMENTAL_API:=true}
|
||||||
|
: ${NUM_MINIONS:=5}
|
||||||
|
;;
|
||||||
|
|
||||||
|
kubernetes-upgrade-1.0-1.1-gce-step6-e2e-new)
|
||||||
|
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
|
||||||
|
: ${E2E_NETWORK:="gce-upgrade-1-0"}
|
||||||
|
: ${JENKINS_FORCE_GET_TARS:=y}
|
||||||
|
: ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
|
||||||
|
: ${PROJECT:="k8s-jkns-gce-upgrade"}
|
||||||
|
: ${E2E_UP:="false"}
|
||||||
|
: ${E2E_TEST:="true"}
|
||||||
|
: ${E2E_DOWN:="true"}
|
||||||
|
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
|
||||||
|
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
|
||||||
|
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
|
||||||
|
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
|
||||||
|
)"}
|
||||||
|
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
|
||||||
|
: ${ENABLE_EXPERIMENTAL_API:=true}
|
||||||
|
: ${NUM_MINIONS:=5}
|
||||||
|
;;
|
||||||
|
|
||||||
|
|
||||||
# Run Kubemark test on a fake 100 node cluster to have a comparison
|
# Run Kubemark test on a fake 100 node cluster to have a comparison
|
||||||
# to the real results from scalability suite
|
# to the real results from scalability suite
|
||||||
kubernetes-kubemark-gce)
|
kubernetes-kubemark-gce)
|
||||||
|
Loading…
Reference in New Issue
Block a user