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

Jenkins: For Trusty tests, float to the latest stable #18727

Merged
merged 1 commit into from Dec 15, 2015
Merged

Jenkins: For Trusty tests, float to the latest stable #18727

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
14 changes: 6 additions & 8 deletions hack/jenkins/e2e.sh
View file
Open in desktop
Expand Up @@ -431,8 +431,6 @@ TRUSTY_BETA_SKIP_TESTS=(
"${TRUSTY_DEFAULT_SKIP_TESTS[@]}"
)

KUBERNETES_VERSION_FOR_TRUSTY="${KUBERNETES_VERSION_FOR_TRUSTY:-"release/v1.1.2"}"

# Define environment variables based on the Jenkins project name.
# NOTE: Not all jobs are defined here. The hack/jenkins/e2e.sh in master and
# release branches defines relevant jobs for that particular version of
Expand Down Expand Up @@ -530,7 +528,7 @@ case ${JOB_NAME} in
: ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"}
: ${KUBE_OS_DISTRIBUTION:="trusty"}
: ${ENABLE_CLUSTER_REGISTRY:=false}
: ${JENKINS_EXPLICIT_VERSION:="${KUBERNETES_VERSION_FOR_TRUSTY}"}
: ${JENKINS_PUBLISHED_VERSION:="release/stable-1.1"}
;;

# Runs slow tests on GCE with Trusy as base image for minions, sequentially.
Expand All @@ -548,7 +546,7 @@ case ${JOB_NAME} in
: ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"}
: ${KUBE_OS_DISTRIBUTION:="trusty"}
: ${ENABLE_CLUSTER_REGISTRY:=false}
: ${JENKINS_EXPLICIT_VERSION:="${KUBERNETES_VERSION_FOR_TRUSTY}"}
: ${JENKINS_PUBLISHED_VERSION:="release/stable-1.1"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
;;

Expand All @@ -571,7 +569,7 @@ case ${JOB_NAME} in
: ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"}
: ${KUBE_OS_DISTRIBUTION:="trusty"}
: ${ENABLE_CLUSTER_REGISTRY:=false}
: ${JENKINS_EXPLICIT_VERSION:="${KUBERNETES_VERSION_FOR_TRUSTY}"}
: ${JENKINS_PUBLISHED_VERSION:="release/stable-1.1"}
;;

# Runs slow tests on GCE with Trusy-dev as base image for minions,
Expand All @@ -590,7 +588,7 @@ case ${JOB_NAME} in
: ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"}
: ${KUBE_OS_DISTRIBUTION:="trusty"}
: ${ENABLE_CLUSTER_REGISTRY:=false}
: ${JENKINS_EXPLICIT_VERSION:="${KUBERNETES_VERSION_FOR_TRUSTY}"}
: ${JENKINS_PUBLISHED_VERSION:="release/stable-1.1"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
;;

Expand All @@ -613,7 +611,7 @@ case ${JOB_NAME} in
: ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"}
: ${KUBE_OS_DISTRIBUTION:="trusty"}
: ${ENABLE_CLUSTER_REGISTRY:=false}
: ${JENKINS_EXPLICIT_VERSION:="${KUBERNETES_VERSION_FOR_TRUSTY}"}
: ${JENKINS_PUBLISHED_VERSION:="release/stable-1.1"}
;;

# Runs slow tests on GCE with Trusy-beta as base image for minions,
Expand All @@ -632,7 +630,7 @@ case ${JOB_NAME} in
: ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"}
: ${KUBE_OS_DISTRIBUTION:="trusty"}
: ${ENABLE_CLUSTER_REGISTRY:=false}
: ${JENKINS_EXPLICIT_VERSION:="${KUBERNETES_VERSION_FOR_TRUSTY}"}
: ${JENKINS_PUBLISHED_VERSION:="release/stable-1.1"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
;;

Expand Down