Merge pull request #3638 from Random-Liu/upload-gcs-cri-release

crosbymichael · web-flow · commit d8ad1bdbb331 · 2019-09-11T15:05:41.000-04:00
Update gcs cri release.
diff --git a/.travis.yml b/.travis.yml
@@ -129,23 +129,8 @@ deploy:
     on:
       repo: containerd/containerd
       tags: true
-  - provider: gcs
-    # Use master branch to work around https://github.com/travis-ci/dpl/issues/792.
-    # TODO: Remove this when the fix for https://github.com/travis-ci/dpl/issues/792
-    # is rolled out.
-    edge:
-      branch: master
-    access_key_id: GOOG1EJPAMPUV4MOGUSPRFM427Q5QOTNODQTMJYPXJFDF46IZLX2NGUQX3T7Q
-    secret_access_key:
-      secure: l3ITadMltGpYXShigdyRfpA7VuNcpGNrY9adB/1dQ5UVp0ZyRyimWX5+ea45JArh95iQCp11kY/7gKgL3tKAPsOXa9Lbt59n3XtlrVk5sqmd4S5+ZaI4Za4cRnkhkIAqro/IYsnzdLHqhCFYEmEDyMiI45RBkYYea+fnZFAGaTePmGwnD2LOn7A1z+dDGHt5g1Rpmdj1kB/AsHG6Wr8oGhMg9RlzSkAw2EAc1X3/9ofjOVM0AyB/hAgm/vmgisnqRSKzILqhL04d5b3gavrFn2YjrSEqP102BgYksn7EsJd1NMjA6Hj/qfVNCTn+rL8M85IE6JIAjrBog/HFv8Ez1bl1kSbB9UmAYZizEi7VD/fcxukYOPgqjDUoLrNaS3q+K0DkE1jzzcr72iMM+I8WJga7Vh4+MYjXadD5V96i2QDpthkEMvy1EpWvwQSl/fexaz2nJA5/CiX/V9GnWVsZiWlq/qMxji/ZbWsB04zRDfk9JneI7tubTNYj5FHrzhCQ7jrZYnXY/pb0sQkF1qczpH4PaXXgLnN00xffNudhsA6xZe/d22Yq+LELXeEmfOKD5j/DGdJGINgMj8RcngyKK6znBlBZ7nF3yqhLg4fHrCk9iOivGUXvKqdruqH+Yl7DUAp1Y0sySFlPF4I8RzMPHGPFqAJ9Q+rN2BNslClHAuA=
-    # TODO: use cri-containerd-release after testing.
-    #bucket: cri-containerd-release
-    bucket: cri-containerd-staging
-    skip_cleanup: true
-    acl: public-read
-    file:
-      - releases/cri/*.tar.gz
-      - releases/cri/*.tar.gz.sha256
+  - provider: script
+    script: bash script/release/deploy-cri
     on:
       repo: containerd/containerd
       # TODO: switch `tags: true` after validating on master
diff --git a/script/release/deploy-cri b/script/release/deploy-cri
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+#   Copyright The containerd Authors.
+
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+
+#       http://www.apache.org/licenses/LICENSE-2.0
+
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+#
+# Deploy the cri-containerd release tarball to gcs.
+#
+set -eu -o pipefail
+
+ROOT=${GOPATH}/src/github.com/containerd/containerd
+# TODO: Change cri-containerd-release after tested.
+BUCKET="gs://cri-containerd-staging"
+
+rm -rf "${HOME}/google-cloud-sdk"
+export CLOUDSDK_CORE_DISABLE_PROMPTS=1
+curl https://sdk.cloud.google.com | bash > /dev/null
+gcloud version
+
+openssl aes-256-cbc -K $encrypted_0a6446eb3ae3_key -iv $encrypted_0a6446eb3ae3_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}"
diff --git a/script/release/gcp-secret.json.enc b/script/release/gcp-secret.json.enc
