mirror of https://github.com/kubernetes/kops.git
Merge pull request #11625 from olemarkus/e2e-upgrade-kops-path
Remove debug code and copy kops to PATH
This commit is contained in:
commit
9e0cc3b69c
|
|
@ -46,15 +46,6 @@ KOPS="${FIRST_KOPS}"
|
|||
|
||||
# Always tear-down the cluster when we're done
|
||||
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"
|
||||
}
|
||||
trap finish EXIT
|
||||
|
|
@ -85,9 +76,9 @@ KOPS="${SECOND_KOPS}"
|
|||
|
||||
"${SECOND_KOPS}" validate cluster
|
||||
|
||||
cp "${SECOND_KOPS}" "${WORKSPACE}/kops"
|
||||
|
||||
${KUBETEST2} \
|
||||
--cloud-provider="${CLOUD_PROVIDER}" \
|
||||
--kops-binary-path="${SECOND_KOPS}" \
|
||||
--test=kops \
|
||||
-- \
|
||||
--test-package-version="${K8S_VERSION}" \
|
||||
|
|
|
|||
Loading…
Reference in New Issue