Merge pull request #29584 from ixdy/node-e2e-separate-project

Automatic merge from submit-queue Run node e2e pull VMs in a separate GCP project I haven't increased quota yet, so we shouldn't merge until I've done so. This is mostly just testing to see if the rest of the plumbing works. Part of #27648. cc @fejta @spxtr @pwittrock  --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29584)

Merge pull request #29584 from ixdy/node-e2e-separate-project
7bd2db47 · Kubernetes Submit Queue · GitHub · 035ec518 · f9b6b702 · 7bd2db47
Commit 7bd2db47 authored Aug 11, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

e2e-node-jenkins.sh test/e2e_node/jenkins/e2e-node-jenkins.sh +11 -0

jenkins-pull.properties test/e2e_node/jenkins/jenkins-pull.properties +1 -1

No files found.
--- a/test/e2e_node/jenkins/e2e-node-jenkins.sh
+++ b/test/e2e_node/jenkins/e2e-node-jenkins.sh
@@ -40,6 +40,17 @@ WORKSPACE=${WORKSPACE:-"/tmp/"}
 ARTIFACTS=${WORKSPACE}/_artifacts

 mkdir -p ${ARTIFACTS}
+
+if [[ -f "${KUBEKINS_SERVICE_ACCOUNT_FILE:-}" ]]; then
+  echo 'Activating service account...'  # No harm in doing this multiple times.
+  gcloud auth activate-service-account --key-file="${KUBEKINS_SERVICE_ACCOUNT_FILE}"
+  # https://developers.google.com/identity/protocols/application-default-credentials
+  export GOOGLE_APPLICATION_CREDENTIALS="${KUBEKINS_SERVICE_ACCOUNT_FILE}"
+  unset KUBEKINS_SERVICE_ACCOUNT_FILE
+elif [[ -n "${KUBEKINS_SERVICE_ACCOUNT_FILE:-}" ]]; then
+  echo "ERROR: cannot access service account file at: ${KUBEKINS_SERVICE_ACCOUNT_FILE}"
+fi
+
 go run test/e2e_node/runner/run_e2e.go  --logtostderr --vmodule=*=4 --ssh-env="gce" \
  --zone="$GCE_ZONE" --project="$GCE_PROJECT" --hosts="$GCE_HOSTS" \
  --images="$GCE_IMAGES" --image-project="$GCE_IMAGE_PROJECT" \

--- a/test/e2e_node/jenkins/jenkins-pull.properties
+++ b/test/e2e_node/jenkins/jenkins-pull.properties
 GCE_HOSTS=
 GCE_IMAGE_CONFIG_PATH=test/e2e_node/jenkins/image-config.yaml
 GCE_ZONE=us-central1-f
-GCE_PROJECT=kubernetes-jenkins-pull
+GCE_PROJECT=k8s-jkns-pr-node-e2e
 CLEANUP=true
 GINKGO_FLAGS='--skip="\[Flaky\]|\[Slow\]|\[Serial\]"'
 SETUP_NODE=false