mirror of https://github.com/kubernetes/kops.git
Remove debug code and copy kops to PATH
This commit is contained in:
parent
5e7c6da57e
commit
120773a464
|
|
@ -46,15 +46,6 @@ KOPS="${FIRST_KOPS}"
|
||||||
|
|
||||||
# Always tear-down the cluster when we're done
|
# Always tear-down the cluster when we're done
|
||||||
function finish {
|
function finish {
|
||||||
|
|
||||||
KOPS_LOG_DIR="${ARTIFACTS}/logs"
|
|
||||||
mkdir -p "${KOPS_LOG_DIR}"
|
|
||||||
|
|
||||||
KOPS_CP=$(${KOPS} toolbox dump -o json | jq -r '.instances[] | select( .roles | index("master" )) | .publicAddresses[0]')
|
|
||||||
|
|
||||||
ssh -i "${AWS_SSH_PRIVATE_KEY_FILE}" "ubuntu@${KOPS_CP}" sudo chmod -R a+r /var/log
|
|
||||||
scp -i "${AWS_SSH_PRIVATE_KEY_FILE}" -r "ubuntu@${KOPS_CP}:/var/log/" "${KOPS_LOG_DIR}"
|
|
||||||
|
|
||||||
${KUBETEST2} --kops-binary-path="${KOPS}" --down || echo "kubetest2 down failed"
|
${KUBETEST2} --kops-binary-path="${KOPS}" --down || echo "kubetest2 down failed"
|
||||||
}
|
}
|
||||||
trap finish EXIT
|
trap finish EXIT
|
||||||
|
|
@ -85,9 +76,9 @@ KOPS="${SECOND_KOPS}"
|
||||||
|
|
||||||
"${SECOND_KOPS}" validate cluster
|
"${SECOND_KOPS}" validate cluster
|
||||||
|
|
||||||
|
cp "${SECOND_KOPS}" "${WORKSPACE}/kops"
|
||||||
|
|
||||||
${KUBETEST2} \
|
${KUBETEST2} \
|
||||||
--cloud-provider="${CLOUD_PROVIDER}" \
|
|
||||||
--kops-binary-path="${SECOND_KOPS}" \
|
|
||||||
--test=kops \
|
--test=kops \
|
||||||
-- \
|
-- \
|
||||||
--test-package-version="${K8S_VERSION}" \
|
--test-package-version="${K8S_VERSION}" \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue