From 6e0bb7742e7f04b744d4ea4f50314c99bc2f2c5c Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Mon, 11 Jul 2016 13:01:35 -0700 Subject: [PATCH] Migrate to kuberetes-release-dev This turns off the kubernetes-release-dev mirror. #28193 should have shifted all the references over, this should ensure that it's true. --- build/common.sh | 6 ++++-- build/push-ci-build.sh | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/common.sh b/build/common.sh index 548f05bd78531..1e11fea29a67c 100755 --- a/build/common.sh +++ b/build/common.sh @@ -1212,7 +1212,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 @@ -1488,7 +1489,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 } diff --git a/build/push-ci-build.sh b/build/push-ci-build.sh index bf5c8e768921c..b70347ea8751b 100755 --- a/build/push-ci-build.sh +++ b/build/push-ci-build.sh @@ -40,8 +40,7 @@ KUBE_GCS_NO_CACHING='n' KUBE_GCS_MAKE_PUBLIC='y' KUBE_GCS_UPLOAD_RELEASE='y' KUBE_GCS_DELETE_EXISTING='y' -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}"