Skip to content

Commit f997c30

Browse files
committed
Skip cleanup in travis deploy and avoid gcs race condition.
Signed-off-by: Lantao Liu <lantaol@google.com>
1 parent 2d4dc24 commit f997c30

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ deploy:
131131
tags: true
132132
- provider: script
133133
script: bash script/release/deploy-cri
134+
skip_cleanup: true
134135
on:
135136
repo: containerd/containerd
136137
# TODO: switch `tags: true` after validating on master

script/release/deploy-cri

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,11 @@ gcloud version
3131
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
3232
gcloud auth activate-service-account --key-file gcp-secret.json --project=k8s-cri-containerd
3333

34-
gsutil cp "${ROOT}/releases/cri/*.tar.gz" "${BUCKET}"
35-
gsutil cp "${ROOT}/releases/cri/*.tar.gz.sha256" "${BUCKET}"
34+
for file in $(ls "${ROOT}"/releases/cri/*.tar.gz.sha256); do
35+
output="$(gsutil cp -n "${file}" "${BUCKET}" 2>&1)"
36+
if [[ "$output" =~ "Skipping existing item" ]];then
37+
echo "$(basename ${file}) already exists, skip the release tarball"
38+
continue
39+
fi
40+
gsutil cp "${file%.sha256}" "${BUCKET}"
41+
done

0 commit comments

Comments
 (0)