Merge pull request #28792 from zmerlynn/stop-mirroring

Automatic merge from submit-queue Migrate to kuberetes-release-dev [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]() This turns off the kubernetes-release-dev mirror. #28193 should have shifted all the references over, this should ensure that it's true. Along the way: Modify it so that the equal bucket and mirror is a noop for things like https://github.com/kubernetes/test-infra/pull/244.

Merge pull request #28792 from zmerlynn/stop-mirroring
6bb0bce0 · k8s-merge-robot · GitHub · cef6f776 · 3edbadc8 · 6bb0bce0
Commit 6bb0bce0 authored Jul 11, 2016 by k8s-merge-robot Committed by GitHub Jul 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

common.sh build/common.sh +4 -2

push-ci-build.sh build/push-ci-build.sh +1 -2

No files found.
--- a/build/common.sh
+++ b/build/common.sh
@@ -1228,7 +1228,8 @@ function kube::release::gcs::copy_release_artifacts() {

  gsutil ls -lhr "${gcs_destination}" || return 1

-  if [[ -n "${KUBE_GCS_RELEASE_BUCKET_MIRROR:-}" ]]; then
+  if [[ -n "${KUBE_GCS_RELEASE_BUCKET_MIRROR:-}" ]] &&
+     [[ "${KUBE_GCS_RELEASE_BUCKET_MIRROR}" != "${KUBE_GCS_RELEASE_BUCKET}" ]]; then
    local -r gcs_mirror="gs://${KUBE_GCS_RELEASE_BUCKET_MIRROR}/${KUBE_GCS_RELEASE_PREFIX}"
    kube::log::status "Mirroring build to ${gcs_mirror}"
    gsutil -q -m "${gcs_options[@]+${gcs_options[@]}}" rsync -d -r "${gcs_destination}" "${gcs_mirror}" || return 1
@@ -1504,7 +1505,8 @@ function kube::release::gcs::publish() {

  kube::release::gcs::publish_to_bucket "${KUBE_GCS_RELEASE_BUCKET}" "${publish_file}" || return 1

-  if [[ -n "${KUBE_GCS_RELEASE_BUCKET_MIRROR:-}" ]]; then
+  if [[ -n "${KUBE_GCS_RELEASE_BUCKET_MIRROR:-}" ]] &&
+     [[ "${KUBE_GCS_RELEASE_BUCKET_MIRROR}" != "${KUBE_GCS_RELEASE_BUCKET}" ]]; then
    kube::release::gcs::publish_to_bucket "${KUBE_GCS_RELEASE_BUCKET_MIRROR}" "${publish_file}" || return 1
  fi
 }

--- a/build/push-ci-build.sh
+++ b/build/push-ci-build.sh
@@ -30,8 +30,7 @@ KUBE_GCS_NO_CACHING='n'
 KUBE_GCS_MAKE_PUBLIC='y'
 KUBE_GCS_UPLOAD_RELEASE='y'
 KUBE_GCS_DELETE_EXISTING='n'
-: ${KUBE_GCS_RELEASE_BUCKET:='kubernetes-release'}
-: ${KUBE_GCS_RELEASE_BUCKET_MIRROR:='kubernetes-release-dev'}
+: ${KUBE_GCS_RELEASE_BUCKET:='kubernetes-release-dev'}
 KUBE_GCS_RELEASE_PREFIX="ci/${LATEST}"
 KUBE_GCS_PUBLISH_VERSION="${LATEST}"