mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 05:03:09 +00:00
Merge pull request #32235 from david-mcmahon/push-build
Automatic merge from submit-queue Change push-ci-build.sh to push-build.sh.
This commit is contained in:
commit
93f8b87d2b
@ -39,15 +39,7 @@ export CLOUDSDK_COMPONENT_MANAGER_DISABLE_UPDATE_CHECK=true
|
|||||||
# FEDERATION?
|
# FEDERATION?
|
||||||
: ${FEDERATION:="false"}
|
: ${FEDERATION:="false"}
|
||||||
: ${KUBE_RELEASE_RUN_TESTS:="n"}
|
: ${KUBE_RELEASE_RUN_TESTS:="n"}
|
||||||
|
export KUBE_RELEASE_RUN_TESTS
|
||||||
# New kubernetes/release/push-ci-build.sh values
|
|
||||||
# RELEASE_INFRA_PUSH=true when we're using kubernetes/release/push-ci-build.sh
|
|
||||||
: ${RELEASE_INFRA_PUSH:="false"}
|
|
||||||
# SET_NOMOCK_FLAG=true means we're doing full pushes and we pass --nomock to
|
|
||||||
# push-ci-build.sh. This is set to false in the
|
|
||||||
# testing jobs and only used in the RELEASE_INFRA_PUSH=true scope below.
|
|
||||||
: ${SET_NOMOCK_FLAG:="true"}
|
|
||||||
export KUBE_RELEASE_RUN_TESTS RELEASE_INFRA_PUSH FEDERATION SET_NOMOCK_FLAG
|
|
||||||
|
|
||||||
# Clean stuff out. Assume the last build left the tree in an odd
|
# Clean stuff out. Assume the last build left the tree in an odd
|
||||||
# state.
|
# state.
|
||||||
@ -72,19 +64,19 @@ else
|
|||||||
mkdir -p ${WORKSPACE}/_tmp
|
mkdir -p ${WORKSPACE}/_tmp
|
||||||
git clone https://github.com/kubernetes/release ${release_infra_clone}
|
git clone https://github.com/kubernetes/release ${release_infra_clone}
|
||||||
|
|
||||||
if [[ ! -x ${release_infra_clone}/push-ci-build.sh ]]; then
|
push_build=${release_infra_clone}/push-build.sh
|
||||||
echo "FATAL: Something went wrong." \
|
|
||||||
"${release_infra_clone}/push-ci-build.sh isn't available." \
|
|
||||||
"Exiting..." >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
if [[ ! -x ${push_build} ]]; then
|
||||||
|
# TODO: Remove/Restore this with the full deprecation PR
|
||||||
|
push_build=${release_infra_clone}/push-ci-build.sh
|
||||||
|
#echo "FATAL: Something went wrong. ${push_build} isn't available." \
|
||||||
|
# "Exiting..." >&2
|
||||||
|
#exit 1
|
||||||
|
fi
|
||||||
[[ -n "${KUBE_GCS_RELEASE_BUCKET-}" ]] \
|
[[ -n "${KUBE_GCS_RELEASE_BUCKET-}" ]] \
|
||||||
&& bucket_flag="--bucket=${KUBE_GCS_RELEASE_BUCKET-}"
|
&& bucket_flag="--bucket=${KUBE_GCS_RELEASE_BUCKET-}"
|
||||||
${FEDERATION} && federation_flag="--federation"
|
${FEDERATION} && federation_flag="--federation"
|
||||||
${SET_NOMOCK_FLAG} && mock_flag="--nomock"
|
${push_build} ${bucket_flag-} ${federation_flag-} --nomock --verbose --ci
|
||||||
${release_infra_clone}/push-ci-build.sh ${bucket_flag-} ${federation_flag-} \
|
|
||||||
${mock_flag-} --verbose
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sha256sum _output/release-tars/kubernetes*.tar.gz
|
sha256sum _output/release-tars/kubernetes*.tar.gz
|
||||||
|
Loading…
Reference in New Issue
Block a user