Merge pull request #14971 from gmarek/fix-jenkins

Add PROJECT to things added by SSL patch
This commit is contained in:
Marek Grabowski 2015-10-02 11:16:01 +02:00
commit 7418221b56
2 changed files with 12 additions and 11 deletions

View File

@ -79,7 +79,8 @@ until gcloud compute ssh --zone="${ZONE}" --project="${PROJECT}" hollow-cluster-
sleep 1
done
gcloud compute ssh --zone=${ZONE} hollow-cluster-master --command="sudo mkdir /srv/kubernetes -p && \
gcloud compute ssh --zone=${ZONE} --project="${PROJECT}" hollow-cluster-master \
--command="sudo mkdir /srv/kubernetes -p && \
sudo bash -c \"echo ${MASTER_CERT_BASE64} | base64 -d > /srv/kubernetes/server.cert\" && \
sudo bash -c \"echo ${MASTER_KEY_BASE64} | base64 -d > /srv/kubernetes/server.key\" && \
sudo bash -c \"echo ${CA_CERT_BASE64} | base64 -d > /srv/kubernetes/ca.crt\" && \

View File

@ -38,4 +38,4 @@ gcloud compute disks delete \
--zone "${ZONE}" \
"${MASTER_NAME}"-pd || true
rm -rf "kubeconfig.loc" &> /dev/null || true
rm -rf "${KUBE_ROOT}/test/kubemark/kubeconfig.loc" &> /dev/null || true