From a442918d314f4ab3de98a45512d2ef60e7939f94 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Sat, 9 May 2015 08:54:54 -0700 Subject: [PATCH] AWS: Don't try to copy gce_keys in jenkins e2e job Should fix e2e builds. For the AWS jenkins jobs, I've been using the secret plugin. --- hack/jenkins/e2e.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index fc2eea8ac86..e708729e2ea 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -150,9 +150,13 @@ if [[ ! "${CIRCLECI:-}" == "true" ]]; then # Move the permissions to jenkins. # $ sudo chown -R jenkins /var/lib/jenkins/gce_keys/ # $ sudo chgrp -R jenkins /var/lib/jenkins/gce_keys/ - mkdir -p ${WORKSPACE}/.ssh/ - cp /var/lib/jenkins/gce_keys/google_compute_engine ${WORKSPACE}/.ssh/ - cp /var/lib/jenkins/gce_keys/google_compute_engine.pub ${WORKSPACE}/.ssh/ + if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then + echo "Skipping SSH key copying for AWS" + else + mkdir -p ${WORKSPACE}/.ssh/ + cp /var/lib/jenkins/gce_keys/google_compute_engine ${WORKSPACE}/.ssh/ + cp /var/lib/jenkins/gce_keys/google_compute_engine.pub ${WORKSPACE}/.ssh/ + fi fi md5sum kubernetes*.tar.gz