Merge pull request #3643 from Random-Liu/skip-cleanup

Skip cleanup in travis deploy and avoid gcs race condition.
This commit is contained in:
Derek McGowan 2019-09-11 18:05:34 -07:00 committed by GitHub
commit 1d484c28ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions

View File

@ -131,6 +131,7 @@ deploy:
tags: true tags: true
- provider: script - provider: script
script: bash script/release/deploy-cri script: bash script/release/deploy-cri
skip_cleanup: true
on: on:
repo: containerd/containerd repo: containerd/containerd
# TODO: switch `tags: true` after validating on master # TODO: switch `tags: true` after validating on master

View File

@ -31,5 +31,11 @@ gcloud version
openssl aes-256-cbc -K $encrypted_5a565171e51f_key -iv $encrypted_5a565171e51f_iv -in "${ROOT}/script/release/gcp-secret.json.enc" -out gcp-secret.json -d openssl aes-256-cbc -K $encrypted_5a565171e51f_key -iv $encrypted_5a565171e51f_iv -in "${ROOT}/script/release/gcp-secret.json.enc" -out gcp-secret.json -d
gcloud auth activate-service-account --key-file gcp-secret.json --project=k8s-cri-containerd gcloud auth activate-service-account --key-file gcp-secret.json --project=k8s-cri-containerd
gsutil cp "${ROOT}/releases/cri/*.tar.gz" "${BUCKET}" for file in $(ls "${ROOT}"/releases/cri/*.tar.gz.sha256); do
gsutil cp "${ROOT}/releases/cri/*.tar.gz.sha256" "${BUCKET}" output="$(gsutil cp -n "${file}" "${BUCKET}" 2>&1)"
if [[ "$output" =~ "Skipping existing item" ]];then
echo "$(basename ${file}) already exists, skip the release tarball"
continue
fi
gsutil cp "${file%.sha256}" "${BUCKET}"
done