Skip to content

K
k3s
Commit 79127cfb authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #17672 from ihmccreery/current-release-redux

Auto commit by PR queue bot
parents 07664a61 bb7dc38f
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 30 deletions
hack/jenkins/e2e.sh
View file @ 79127cfb
...@@ -111,6 +111,11 @@ if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then ...@@ -111,6 +111,11 @@ if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then
fi fi
fi fi
# CURRENT_RELEASE_PUBLISHED_VERSION is the JENKINS_PUBLISHED_VERSION for the
# release we are currently pointing our release testing infrastructure at.
# When 1.2.0-beta.0 comes out, e.g., this will become "ci/latest-1.2"
CURRENT_RELEASE_PUBLISHED_VERSION="ci/latest-1.1"
# Specialized to skip when running reboot tests. # Specialized to skip when running reboot tests.
REBOOT_SKIP_TESTS=( REBOOT_SKIP_TESTS=(
"Skipped" "Skipped"
...@@ -1050,18 +1055,18 @@ case ${JOB_NAME} in ...@@ -1050,18 +1055,18 @@ case ${JOB_NAME} in
)"} )"}
;; ;;
# kubernetes-upgrade-gke-1.0-1.1 # kubernetes-upgrade-gke-1.0-current-release
# #
# This suite: # This suite:
# #
# 1. launches a cluster at ci/latest-1.0, # 1. launches a cluster at ci/latest-1.0,
# 2. upgrades the master to ci/latest-1.1 # 2. upgrades the master to CURRENT_RELEASE_PUBLISHED_VERSION
# 3. runs ci/latest-1.0 e2es, # 3. runs ci/latest-1.0 e2es,
# 4. upgrades the rest of the cluster, # 4. upgrades the rest of the cluster,
# 5. runs ci/latest-1.0 e2es again, then # 5. runs ci/latest-1.0 e2es again, then
# 6. runs ci/latest-1.1 e2es and tears down the cluster. # 6. runs CURRENT_RELEASE_PUBLISHED_VERSION e2es and tears down the cluster.
kubernetes-upgrade-1.0-1.1-gke-step1-deploy) kubernetes-upgrade-1.0-current-release-gke-step1-deploy)
: ${DOGFOOD_GCLOUD:="true"} : ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
...@@ -1074,23 +1079,23 @@ case ${JOB_NAME} in ...@@ -1074,23 +1079,23 @@ case ${JOB_NAME} in
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
;; ;;
kubernetes-upgrade-1.0-1.1-gke-step2-upgrade-master) kubernetes-upgrade-1.0-current-release-gke-step2-upgrade-master)
: ${DOGFOOD_GCLOUD:="true"} : ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
: ${E2E_NETWORK:="gke-upgrade-1-0"} : ${E2E_NETWORK:="gke-upgrade-1-0"}
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
# Use upgrade logic of version we're upgrading to. # Use upgrade logic of version we're upgrading to.
: ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"} : ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"}
: ${JENKINS_FORCE_GET_TARS:=y} : ${JENKINS_FORCE_GET_TARS:=y}
: ${PROJECT:="kubernetes-jenkins-gke-upgrade"} : ${PROJECT:="kubernetes-jenkins-gke-upgrade"}
: ${E2E_UP:="false"} : ${E2E_UP:="false"}
: ${E2E_TEST:="true"} : ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master --upgrade-target=ci/latest-1.1"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master --upgrade-target=${CURRENT_RELEASE_PUBLISHED_VERSION}"}
;; ;;
kubernetes-upgrade-1.0-1.1-gke-step3-e2e-old) kubernetes-upgrade-1.0-current-release-gke-step3-e2e-old)
: ${DOGFOOD_GCLOUD:="true"} : ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
...@@ -1110,23 +1115,23 @@ case ${JOB_NAME} in ...@@ -1110,23 +1115,23 @@ case ${JOB_NAME} in
)"} )"}
;; ;;
kubernetes-upgrade-1.0-1.1-gke-step4-upgrade-cluster) kubernetes-upgrade-1.0-current-release-gke-step4-upgrade-cluster)
: ${DOGFOOD_GCLOUD:="true"} : ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
: ${E2E_NETWORK:="gke-upgrade-1-0"} : ${E2E_NETWORK:="gke-upgrade-1-0"}
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
# Use upgrade logic of version we're upgrading to. # Use upgrade logic of version we're upgrading to.
: ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"} : ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"}
: ${JENKINS_FORCE_GET_TARS:=y} : ${JENKINS_FORCE_GET_TARS:=y}
: ${PROJECT:="kubernetes-jenkins-gke-upgrade"} : ${PROJECT:="kubernetes-jenkins-gke-upgrade"}
: ${E2E_UP:="false"} : ${E2E_UP:="false"}
: ${E2E_TEST:="true"} : ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster --upgrade-target=ci/latest-1.1"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster --upgrade-target=${CURRENT_RELEASE_PUBLISHED_VERSION}"}
;; ;;
kubernetes-upgrade-1.0-1.1-gke-step5-e2e-old) kubernetes-upgrade-1.0-current-release-gke-step5-e2e-old)
: ${DOGFOOD_GCLOUD:="true"} : ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
...@@ -1146,16 +1151,16 @@ case ${JOB_NAME} in ...@@ -1146,16 +1151,16 @@ case ${JOB_NAME} in
)"} )"}
;; ;;
kubernetes-upgrade-1.0-1.1-gke-step6-e2e-new) kubernetes-upgrade-1.0-current-release-gke-step6-e2e-new)
: ${DOGFOOD_GCLOUD:="true"} : ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
: ${E2E_NETWORK:="gke-upgrade-1-0"} : ${E2E_NETWORK:="gke-upgrade-1-0"}
# TODO(15011): these really shouldn't be (very) version skewed, but because # TODO(15011): these really shouldn't be (very) version skewed, but because
# we have to get ci/latest-1.1 again, it could get slightly out of whack. # we have to get CURRENT_RELEASE_PUBLISHED_VERSION again, it could get slightly out of whack.
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
: ${JENKINS_FORCE_GET_TARS:=y} : ${JENKINS_FORCE_GET_TARS:=y}
: ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"} : ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"}
: ${PROJECT:="kubernetes-jenkins-gke-upgrade"} : ${PROJECT:="kubernetes-jenkins-gke-upgrade"}
: ${E2E_UP:="false"} : ${E2E_UP:="false"}
: ${E2E_TEST:="true"} : ${E2E_TEST:="true"}
...@@ -1277,18 +1282,18 @@ case ${JOB_NAME} in ...@@ -1277,18 +1282,18 @@ case ${JOB_NAME} in
: ${NUM_MINIONS:=5} : ${NUM_MINIONS:=5}
;; ;;
# kubernetes-upgrade-gce-1.0-1.1 # kubernetes-upgrade-gce-1.0-current-release
# #
# This suite: # This suite:
# #
# 1. launches a cluster at ci/latest-1.0, # 1. launches a cluster at ci/latest-1.0,
# 2. upgrades the master to ci/latest-1.1 # 2. upgrades the master to CURRENT_RELEASE_PUBLISHED_VERSION
# 3. runs ci/latest-1.0 e2es, # 3. runs ci/latest-1.0 e2es,
# 4. upgrades the rest of the cluster, # 4. upgrades the rest of the cluster,
# 5. runs ci/latest-1.0 e2es again, then # 5. runs ci/latest-1.0 e2es again, then
# 6. runs ci/latest-1.1 e2es and tears down the cluster. # 6. runs CURRENT_RELEASE_PUBLISHED_VERSION e2es and tears down the cluster.
kubernetes-upgrade-1.0-1.1-gce-step1-deploy) kubernetes-upgrade-1.0-current-release-gce-step1-deploy)
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
: ${E2E_NETWORK:="gce-upgrade-1-0"} : ${E2E_NETWORK:="gce-upgrade-1-0"}
: ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.0"} : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.0"}
...@@ -1300,25 +1305,25 @@ case ${JOB_NAME} in ...@@ -1300,25 +1305,25 @@ case ${JOB_NAME} in
: ${NUM_MINIONS:=5} : ${NUM_MINIONS:=5}
;; ;;
kubernetes-upgrade-1.0-1.1-gce-step2-upgrade-master) kubernetes-upgrade-1.0-current-release-gce-step2-upgrade-master)
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
: ${E2E_NETWORK:="gce-upgrade-1-0"} : ${E2E_NETWORK:="gce-upgrade-1-0"}
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
# Use upgrade logic of version we're upgrading to. # Use upgrade logic of version we're upgrading to.
: ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"} : ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"}
: ${JENKINS_FORCE_GET_TARS:=y} : ${JENKINS_FORCE_GET_TARS:=y}
: ${PROJECT:="k8s-jkns-gce-upgrade"} : ${PROJECT:="k8s-jkns-gce-upgrade"}
: ${E2E_UP:="false"} : ${E2E_UP:="false"}
: ${E2E_TEST:="true"} : ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master --upgrade-target=ci/latest-1.1"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master --upgrade-target=${CURRENT_RELEASE_PUBLISHED_VERSION}"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"} : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
: ${NUM_MINIONS:=5} : ${NUM_MINIONS:=5}
: ${KUBE_ENABLE_DEPLOYMENTS:=true} : ${KUBE_ENABLE_DEPLOYMENTS:=true}
: ${KUBE_ENABLE_DAEMONSETS:=true} : ${KUBE_ENABLE_DAEMONSETS:=true}
;; ;;
kubernetes-upgrade-1.0-1.1-gce-step3-e2e-old) kubernetes-upgrade-1.0-current-release-gce-step3-e2e-old)
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
: ${E2E_NETWORK:="gce-upgrade-1-0"} : ${E2E_NETWORK:="gce-upgrade-1-0"}
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
...@@ -1337,25 +1342,25 @@ case ${JOB_NAME} in ...@@ -1337,25 +1342,25 @@ case ${JOB_NAME} in
: ${NUM_MINIONS:=5} : ${NUM_MINIONS:=5}
;; ;;
kubernetes-upgrade-1.0-1.1-gce-step4-upgrade-cluster) kubernetes-upgrade-1.0-current-release-gce-step4-upgrade-cluster)
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
: ${E2E_NETWORK:="gce-upgrade-1-0"} : ${E2E_NETWORK:="gce-upgrade-1-0"}
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
# Use upgrade logic of version we're upgrading to. # Use upgrade logic of version we're upgrading to.
: ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"} : ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"}
: ${JENKINS_FORCE_GET_TARS:=y} : ${JENKINS_FORCE_GET_TARS:=y}
: ${PROJECT:="k8s-jkns-gce-upgrade"} : ${PROJECT:="k8s-jkns-gce-upgrade"}
: ${E2E_UP:="false"} : ${E2E_UP:="false"}
: ${E2E_TEST:="true"} : ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster --upgrade-target=ci/latest-1.1"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster --upgrade-target=${CURRENT_RELEASE_PUBLISHED_VERSION}"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"} : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
: ${NUM_MINIONS:=5} : ${NUM_MINIONS:=5}
: ${KUBE_ENABLE_DEPLOYMENTS:=true} : ${KUBE_ENABLE_DEPLOYMENTS:=true}
: ${KUBE_ENABLE_DAEMONSETS:=true} : ${KUBE_ENABLE_DAEMONSETS:=true}
;; ;;
kubernetes-upgrade-1.0-1.1-gce-step5-e2e-old) kubernetes-upgrade-1.0-current-release-gce-step5-e2e-old)
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
: ${E2E_NETWORK:="gce-upgrade-1-0"} : ${E2E_NETWORK:="gce-upgrade-1-0"}
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
...@@ -1374,14 +1379,14 @@ case ${JOB_NAME} in ...@@ -1374,14 +1379,14 @@ case ${JOB_NAME} in
: ${NUM_MINIONS:=5} : ${NUM_MINIONS:=5}
;; ;;
kubernetes-upgrade-1.0-1.1-gce-step6-e2e-new) kubernetes-upgrade-1.0-current-release-gce-step6-e2e-new)
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
: ${E2E_NETWORK:="gce-upgrade-1-0"} : ${E2E_NETWORK:="gce-upgrade-1-0"}
# TODO(15011): these really shouldn't be (very) version skewed, but because # TODO(15011): these really shouldn't be (very) version skewed, but because
# we have to get ci/latest-1.1 again, it could get slightly out of whack. # we have to get CURRENT_RELEASE_PUBLISHED_VERSION again, it could get slightly out of whack.
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
: ${JENKINS_FORCE_GET_TARS:=y} : ${JENKINS_FORCE_GET_TARS:=y}
: ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"} : ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"}
: ${PROJECT:="k8s-jkns-gce-upgrade"} : ${PROJECT:="k8s-jkns-gce-upgrade"}
: ${E2E_UP:="false"} : ${E2E_UP:="false"}
: ${E2E_TEST:="true"} : ${E2E_TEST:="true"}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment