Skip to content

K
k3s
Commit 6bb0bce0 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

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.
parents cef6f776 3edbadc8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
build/common.sh
View file @ 6bb0bce0
...@@ -1228,7 +1228,8 @@ function kube::release::gcs::copy_release_artifacts() { ...@@ -1228,7 +1228,8 @@ function kube::release::gcs::copy_release_artifacts() {
gsutil ls -lhr "${gcs_destination}" || return 1 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}" local -r gcs_mirror="gs://${KUBE_GCS_RELEASE_BUCKET_MIRROR}/${KUBE_GCS_RELEASE_PREFIX}"
kube::log::status "Mirroring build to ${gcs_mirror}" kube::log::status "Mirroring build to ${gcs_mirror}"
gsutil -q -m "${gcs_options[@]+${gcs_options[@]}}" rsync -d -r "${gcs_destination}" "${gcs_mirror}" || return 1 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() { ...@@ -1504,7 +1505,8 @@ function kube::release::gcs::publish() {
kube::release::gcs::publish_to_bucket "${KUBE_GCS_RELEASE_BUCKET}" "${publish_file}" || return 1 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 kube::release::gcs::publish_to_bucket "${KUBE_GCS_RELEASE_BUCKET_MIRROR}" "${publish_file}" || return 1
fi fi
} }
......
build/push-ci-build.sh
View file @ 6bb0bce0
...@@ -30,8 +30,7 @@ KUBE_GCS_NO_CACHING='n' ...@@ -30,8 +30,7 @@ KUBE_GCS_NO_CACHING='n'
KUBE_GCS_MAKE_PUBLIC='y' KUBE_GCS_MAKE_PUBLIC='y'
KUBE_GCS_UPLOAD_RELEASE='y' KUBE_GCS_UPLOAD_RELEASE='y'
KUBE_GCS_DELETE_EXISTING='n' KUBE_GCS_DELETE_EXISTING='n'
: ${KUBE_GCS_RELEASE_BUCKET:='kubernetes-release'} : ${KUBE_GCS_RELEASE_BUCKET:='kubernetes-release-dev'}
: ${KUBE_GCS_RELEASE_BUCKET_MIRROR:='kubernetes-release-dev'}
KUBE_GCS_RELEASE_PREFIX="ci/${LATEST}" KUBE_GCS_RELEASE_PREFIX="ci/${LATEST}"
KUBE_GCS_PUBLISH_VERSION="${LATEST}" KUBE_GCS_PUBLISH_VERSION="${LATEST}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment