From 9fa35d0bc6fc31fb301f9bb3b7e1606db816fbe2 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Thu, 14 Apr 2016 13:34:05 -0700 Subject: [PATCH] Set metadata.google.internal IP in dockerized e2e based on /etc/hosts --- hack/jenkins/dockerized-e2e-runner.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hack/jenkins/dockerized-e2e-runner.sh b/hack/jenkins/dockerized-e2e-runner.sh index 91bdf284659..8c75a923977 100755 --- a/hack/jenkins/dockerized-e2e-runner.sh +++ b/hack/jenkins/dockerized-e2e-runner.sh @@ -17,7 +17,19 @@ # Save environment variables in $WORKSPACE/env.list and then run the Jenkins e2e # test runner inside the kubekins-test Docker image. +set -o errexit +set -o nounset +set -o pipefail + env -u HOME -u PATH -u PWD -u WORKSPACE >${WORKSPACE}/env.list + +# Add all uncommented lines for metadata.google.internal in /etc/hosts to the +# test container. +readonly METADATA_SERVER_ADD_HOST_ARGS=($( + grep '^[0-9a-fA-F\.:]\+ \+metadata\.google\.internal' /etc/hosts |\ + cut -f1 -d' ' |\ + xargs -r printf -- '--add-host="metadata.google.internal:%s"\n')) + docker run --rm=true -i \ -v "${WORKSPACE}/_artifacts":/workspace/_artifacts \ -v /etc/localtime:/etc/localtime:ro \ @@ -25,5 +37,6 @@ docker run --rm=true -i \ --env-file "${WORKSPACE}/env.list" \ -e "HOME=/workspace" \ -e "WORKSPACE=/workspace" \ + "${METADATA_SERVER_ADD_HOST_ARGS[@]:+${METADATA_SERVER_ADD_HOST_ARGS[@]}}" \ gcr.io/google_containers/kubekins-test:0.9 \ bash -c "bash <(curl -fsS --retry 3 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"