Merge pull request #11648 from olemarkus/e2e-merge-ab

Use version marker for kops ab scenario
This commit is contained in:
Kubernetes Prow Robot 2021-06-01 11:59:51 -07:00 committed by GitHub
commit 04db0c9507
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions

View File

@ -50,10 +50,12 @@ go install ./kubetest2-tester-kops
KOPS_B=${WORKDIR}/kops-${KOPS_VERSION_B}
if [[ "${KOPS_VERSION_B}" == "source" ]]; then
${KUBETEST2} --build --kops-root="${REPO_ROOT}" --stage-location="${STAGE_LOCATION:-}" --kops-binary-path="${KOPS_B}"
KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt)"
wget -qO "${KOPS_B}" "$KOPS_BASE_URL/$(go env GOOS)/$(go env GOARCH)/kops"
chmod +x "${KOPS_B}"
else
wget -O "${KOPS_B}" "https://github.com/kubernetes/kops/releases/download/$KOPS_VERSION_B/kops-$(go env GOOS)-$(go env GOARCH)"
chmod +x "${KOPS_B}"
wget -O "${KOPS_B}" "https://github.com/kubernetes/kops/releases/download/$KOPS_VERSION_B/kops-$(go env GOOS)-$(go env GOARCH)"
chmod +x "${KOPS_B}"
fi
# Always tear-down the cluster when we're done
@ -96,6 +98,8 @@ KUBECONFIG="${KUBECONFIG_A}" kubectl get nodes -owide
# Verify kubeconfig-a still works
KUBECONFIG="${KUBECONFIG_A}" kubectl get nodes -owide
cp "${KOPS_B}" "${WORKSPACE}/kops"
${KUBETEST2} \
--cloud-provider="${CLOUD_PROVIDER}" \
--kops-binary-path="${KOPS_B}" \