Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kubernetes-upgrade-1.0-1.1-gke configs using ci/latest-1.1 #15717

Merged
merged 1 commit into from
Oct 15, 2015
Merged

kubernetes-upgrade-1.0-1.1-gke configs using ci/latest-1.1 #15717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions cluster/gke/util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ function detect-project() {
# Execute prior to running tests to build a release if required for env.
function test-build-release() {
echo "... in gke:test-build-release()" >&2
# We currently use the Kubernetes version that GKE supports (not testing
# bleeding-edge builds).
echo "... We currently use the Kubernetes version that GKE supports,"
echo "... not bleeding-edge builds."
}

# Verify needed binaries exist.
Expand Down
40 changes: 24 additions & 16 deletions hack/jenkins/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,11 +498,11 @@ case ${JOB_NAME} in
# This suite:
#
# 1. launches a cluster at release/latest,
# 2. upgrades the master to HEAD,
# 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 HEAD e2es and tears down the cluster.
# 6. runs ci/latest e2es and tears down the cluster.

kubernetes-upgrade-gke-step1-deploy)
: ${DOGFOOD_GCLOUD:="true"}
Expand Down Expand Up @@ -590,7 +590,7 @@ case ${JOB_NAME} in
: ${E2E_CLUSTER_NAME:="gke-upgrade"}
: ${E2E_NETWORK:="gke-upgrade"}
# TODO(15011): these really shouldn't be (very) version skewed, but because
# we have to rebuild, it could get slightly out of whack.
# 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:="kubernetes-jenkins-gke-upgrade"}
Expand All @@ -610,16 +610,11 @@ case ${JOB_NAME} in
# This suite:
#
# 1. launches a cluster at release/latest-1.0,
# 2. upgrades the master to ci/v1.1.0-alpha.1,
# 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/v1.1.0-alpha.1 e2es and tears down the cluster.
#
# TODO(13339): this suite should be upgrading to release/latest-1.1, or some
# other release candidate published version, not ci/v1.1.0-alpha.1, but
# because 1.1 is only an alpha release, and we haven't figured out alpha
# release mechanics, that target doesn't yet exist.
# 6. runs ci/latest-1.1 e2es and tears down the cluster.

kubernetes-upgrade-1.0-1.1-gke-step1-deploy)
: ${DOGFOOD_GCLOUD:="true"}
Expand All @@ -639,13 +634,14 @@ case ${JOB_NAME} in
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
: ${E2E_NETWORK:="gke-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}
: ${JENKINS_EXPLICIT_VERSION:="ci/v1.1.0-alpha.1"}
: ${PROJECT:="kubernetes-jenkins-gke-upgrade"}
: ${E2E_UP:="false"}
: ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master --upgrade-target=ci/latest-1.1"}
;;

kubernetes-upgrade-1.0-1.1-gke-step3-e2e-old)
Expand Down Expand Up @@ -674,13 +670,14 @@ case ${JOB_NAME} in
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
: ${E2E_NETWORK:="gke-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}
: ${JENKINS_EXPLICIT_VERSION:="ci/v1.1.0-alpha.1"}
: ${PROJECT:="kubernetes-jenkins-gke-upgrade"}
: ${E2E_UP:="false"}
: ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster --upgrade-target=ci/latest-1.1"}
;;

kubernetes-upgrade-1.0-1.1-gke-step5-e2e-old)
Expand Down Expand Up @@ -709,7 +706,7 @@ case ${JOB_NAME} in
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
: ${E2E_NETWORK:="gke-upgrade-1-0"}
: ${JENKINS_FORCE_GET_TARS:=y}
: ${JENKINS_EXPLICIT_VERSION:="ci/v1.1.0-alpha.1"}
: ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
: ${PROJECT:="kubernetes-jenkins-gke-upgrade"}
: ${E2E_UP:="false"}
: ${E2E_TEST:="true"}
Expand All @@ -722,6 +719,17 @@ case ${JOB_NAME} in
)"}
;;

# 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"}
Expand Down Expand Up @@ -806,7 +814,7 @@ case ${JOB_NAME} in
: ${E2E_CLUSTER_NAME:="gce-upgrade"}
: ${E2E_NETWORK:="gce-upgrade"}
# TODO(15011): these really shouldn't be (very) version skewed, but because
# we have to rebuild, it could get slightly out of whack.
# 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"}
Expand Down