Skip to content

Commit

Permalink
Migrate to kuberetes-release-dev
Browse files Browse the repository at this point in the history
This turns off the kubernetes-release-dev mirror. kubernetes#28193 should have
shifted all the references over, this should ensure that it's true.
  • Loading branch information
zmerlynn committed Jul 11, 2016
1 parent 4726b52 commit 3edbadc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 4 additions & 2 deletions build/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions build/push-ci-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down

0 comments on commit 3edbadc

Please sign in to comment.