Skip to content

K
k3s
Commit 56ff9061 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #17178 from wonderfly/master

Auto commit by PR queue bot
parents e88593d7 8c0f77e4
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
hack/jenkins/e2e.sh
View file @ 56ff9061
...@@ -529,7 +529,7 @@ case ${JOB_NAME} in ...@@ -529,7 +529,7 @@ case ${JOB_NAME} in
: ${ENABLE_CLUSTER_REGISTRY:=false} : ${ENABLE_CLUSTER_REGISTRY:=false}
# Ideally we would pin to the latest release version but since 1.1 is not # Ideally we would pin to the latest release version but since 1.1 is not
# out, we use the latest build number from the CI job. # out, we use the latest build number from the CI job.
: ${JENKINS_EXPLICIT_VERSION:="ci/v1.1.1-beta.535+b59eb94b3bf0ee"} : ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"}
;; ;;
# Runs non-flaky tests on GCE with Trusty-beta as base image for minions, # Runs non-flaky tests on GCE with Trusty-beta as base image for minions,
...@@ -550,7 +550,7 @@ case ${JOB_NAME} in ...@@ -550,7 +550,7 @@ case ${JOB_NAME} in
: ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"} : ${KUBE_GCE_MINION_IMAGE:="$(get_latest_trusty_image ${JOB_NAME})"}
: ${KUBE_OS_DISTRIBUTION:="trusty"} : ${KUBE_OS_DISTRIBUTION:="trusty"}
: ${ENABLE_CLUSTER_REGISTRY:=false} : ${ENABLE_CLUSTER_REGISTRY:=false}
: ${JENKINS_EXPLICIT_VERSION:="ci/v1.1.1-beta.535+b59eb94b3bf0ee"} : ${JENKINS_EXPLICIT_VERSION:="release/v1.1.1"}
;; ;;
# Runs non-flaky tests on GCE on the release candidate branch, # Runs non-flaky tests on GCE on the release candidate branch,
......
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