mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-10-31 05:40:42 +00:00 
			
		
		
		
	Merge pull request #19378 from ihmccreery/remove-update-jobs
Remove old gce-upgrade jobs
This commit is contained in:
		| @@ -753,115 +753,6 @@ case ${JOB_NAME} in | |||||||
|     configure_upgrade_step 'configured-in-release-1.1' 'ci/latest' 'upgrade-gce-1-1-master' 'k8s-jkns-gce-upgrade' |     configure_upgrade_step 'configured-in-release-1.1' 'ci/latest' 'upgrade-gce-1-1-master' 'k8s-jkns-gce-upgrade' | ||||||
|     ;; |     ;; | ||||||
|  |  | ||||||
|   # kubernetes-upgrade-gce |  | ||||||
|   # |  | ||||||
|   # This suite: |  | ||||||
|   # |  | ||||||
|   # 1. launches a cluster at release/latest, |  | ||||||
|   # 2. upgrades the master to ci/latest, |  | ||||||
|   # 3. runs release/latest e2es, |  | ||||||
|   # 4. upgrades the rest of the cluster, |  | ||||||
|   # 5. runs release/latest e2es again, then |  | ||||||
|   # 6. runs ci/latest e2es and tears down the cluster. |  | ||||||
|  |  | ||||||
|   kubernetes-upgrade-gce-step1-deploy) |  | ||||||
|     : ${E2E_CLUSTER_NAME:="gce-upgrade"} |  | ||||||
|     : ${E2E_NETWORK:="gce-upgrade"} |  | ||||||
|     : ${JENKINS_PUBLISHED_VERSION:="release/latest"} |  | ||||||
|     : ${PROJECT:="k8s-jkns-gce-upgrade"} |  | ||||||
|     : ${E2E_UP:="true"} |  | ||||||
|     : ${E2E_TEST:="false"} |  | ||||||
|     : ${E2E_DOWN:="false"} |  | ||||||
|     : ${NUM_NODES:=5} |  | ||||||
|     ;; |  | ||||||
|  |  | ||||||
|   kubernetes-upgrade-gce-step2-upgrade-master) |  | ||||||
|     : ${E2E_CLUSTER_NAME:="gce-upgrade"} |  | ||||||
|     : ${E2E_NETWORK:="gce-upgrade"} |  | ||||||
|     : ${E2E_OPT:="--check_version_skew=false"} |  | ||||||
|     : ${JENKINS_FORCE_GET_TARS:=y} |  | ||||||
|     : ${PROJECT:="k8s-jkns-gce-upgrade"} |  | ||||||
|     : ${E2E_UP:="false"} |  | ||||||
|     : ${E2E_TEST:="true"} |  | ||||||
|     : ${E2E_DOWN:="false"} |  | ||||||
|     : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Cluster\sUpgrade.*upgrade-master"} |  | ||||||
|     : ${NUM_NODES:=5} |  | ||||||
|     : ${KUBE_ENABLE_DEPLOYMENTS:=true} |  | ||||||
|     : ${KUBE_ENABLE_DAEMONSETS:=true} |  | ||||||
|     ;; |  | ||||||
|  |  | ||||||
|   kubernetes-upgrade-gce-step3-e2e-old) |  | ||||||
|     : ${E2E_CLUSTER_NAME:="gce-upgrade"} |  | ||||||
|     : ${E2E_NETWORK:="gce-upgrade"} |  | ||||||
|     : ${E2E_OPT:="--check_version_skew=false"} |  | ||||||
|     : ${JENKINS_FORCE_GET_TARS:=y} |  | ||||||
|     : ${JENKINS_USE_RELEASE_TARS:=y} |  | ||||||
|     : ${JENKINS_FORCE_GET_TARS:=y} |  | ||||||
|     # Run release/latest e2es |  | ||||||
|     : ${JENKINS_PUBLISHED_VERSION:="release/latest"} |  | ||||||
|     : ${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[@]}} \ |  | ||||||
|           )"} |  | ||||||
|     : ${NUM_NODES:=5} |  | ||||||
|     ;; |  | ||||||
|  |  | ||||||
|   kubernetes-upgrade-gce-step4-upgrade-cluster) |  | ||||||
|     : ${E2E_CLUSTER_NAME:="gce-upgrade"} |  | ||||||
|     : ${E2E_NETWORK:="gce-upgrade"} |  | ||||||
|     : ${E2E_OPT:="--check_version_skew=false"} |  | ||||||
|     : ${JENKINS_FORCE_GET_TARS:=y} |  | ||||||
|     : ${PROJECT:="k8s-jkns-gce-upgrade"} |  | ||||||
|     : ${E2E_UP:="false"} |  | ||||||
|     : ${E2E_TEST:="true"} |  | ||||||
|     : ${E2E_DOWN:="false"} |  | ||||||
|     : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Cluster\sUpgrade.*upgrade-cluster"} |  | ||||||
|     : ${NUM_NODES:=5} |  | ||||||
|     : ${KUBE_ENABLE_DEPLOYMENTS:=true} |  | ||||||
|     : ${KUBE_ENABLE_DAEMONSETS:=true} |  | ||||||
|     ;; |  | ||||||
|  |  | ||||||
|   kubernetes-upgrade-gce-step5-e2e-old) |  | ||||||
|     : ${E2E_CLUSTER_NAME:="gce-upgrade"} |  | ||||||
|     : ${E2E_NETWORK:="gce-upgrade"} |  | ||||||
|     : ${E2E_OPT:="--check_version_skew=false"} |  | ||||||
|     : ${JENKINS_FORCE_GET_TARS:=y} |  | ||||||
|     # Run release/latest e2es |  | ||||||
|     : ${JENKINS_PUBLISHED_VERSION:="release/latest"} |  | ||||||
|     : ${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[@]}} \ |  | ||||||
|           )"} |  | ||||||
|     : ${NUM_NODES:=5} |  | ||||||
|     ;; |  | ||||||
|  |  | ||||||
|   kubernetes-upgrade-gce-step6-e2e-new) |  | ||||||
|     : ${E2E_CLUSTER_NAME:="gce-upgrade"} |  | ||||||
|     : ${E2E_NETWORK:="gce-upgrade"} |  | ||||||
|     # TODO(15011): these really shouldn't be (very) version skewed, but because |  | ||||||
|     # we have to get ci/latest again, it could get slightly out of whack. |  | ||||||
|     : ${E2E_OPT:="--check_version_skew=false"} |  | ||||||
|     : ${JENKINS_FORCE_GET_TARS:=y} |  | ||||||
|     : ${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[@]}} \ |  | ||||||
|           )"} |  | ||||||
|     : ${NUM_NODES:=5} |  | ||||||
|     ;; |  | ||||||
|  |  | ||||||
|   # kubernetes-upgrade-gce-1.0-current-release |   # kubernetes-upgrade-gce-1.0-current-release | ||||||
|   # |   # | ||||||
|   # This suite: |   # This suite: | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user