From f997c30ec6a30cb128b2e0856389e5dd3be0dccb Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Wed, 11 Sep 2019 16:49:36 -0700
Subject: [PATCH] Skip cleanup in travis deploy and avoid gcs race condition.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 .travis.yml               |  1 +
 script/release/deploy-cri | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b62d6bf3d..837ffecdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -131,6 +131,7 @@ deploy:
       tags: true
   - provider: script
     script: bash script/release/deploy-cri
+    skip_cleanup: true
     on:
       repo: containerd/containerd
       # TODO: switch `tags: true` after validating on master
diff --git a/script/release/deploy-cri b/script/release/deploy-cri
index efdbea83c..793b87547 100755
--- a/script/release/deploy-cri
+++ b/script/release/deploy-cri
@@ -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
 gcloud auth activate-service-account --key-file gcp-secret.json --project=k8s-cri-containerd
 
-gsutil cp "${ROOT}/releases/cri/*.tar.gz" "${BUCKET}"
-gsutil cp "${ROOT}/releases/cri/*.tar.gz.sha256" "${BUCKET}"
+for file in $(ls "${ROOT}"/releases/cri/*.tar.gz.sha256); do
+  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