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: Get the image project for Trusty dynamically #20843

Merged
merged 1 commit into from Feb 9, 2016
Merged

jenkins: Get the image project for Trusty dynamically #20843

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: 12 additions & 2 deletions hack/jenkins/e2e.sh
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ function join_regex_allow_empty() {
echo "$*"
}

# Join all args with |, butin case of empty result prints "EMPTY\sSET" instead.
# Join all args with |, but in case of empty result prints "EMPTY\sSET" instead.
# Example: join_regex_no_empty a b "c d" e => a|b|c d|e
# join_regex_no_empty => EMPTY\sSET
function join_regex_no_empty() {
Expand All @@ -40,7 +40,12 @@ function join_regex_no_empty() {
}

# GCP Project to fetch Trusty images.
TRUSTY_IMAGE_PROJECT="${TRUSTY_IMAGE_PROJECT:-}"
function get_trusty_image_project() {
gsutil cat "gs://trusty-images/image-project.txt"
# Clean up gsutil artifacts otherwise the later test stage will complain.
rm -rf .config &> /dev/null
rm -rf .gsutil &> /dev/null
}

# Get the latest Trusty image for a Jenkins job.
function get_latest_trusty_image() {
Expand Down Expand Up @@ -425,6 +430,11 @@ TRUSTY_STABLE_SKIP_TESTS=(
"${TRUSTY_DEFAULT_SKIP_TESTS[@]}"
)

# The project to fetch Trusty images.
if [[ "${JOB_NAME}" =~ kubernetes-e2e-gce-trusty ]]; then
TRUSTY_IMAGE_PROJECT="$(get_trusty_image_project)"
fi

# 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