github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add SET_NOMOCK_FLAG handling. 

Pass thru KUBE_GCS_RELEASE_BUCKET (for federation yamls that change it).
pull/6/head
David McMahon 2016-08-05 17:46:34 -07:00
parent 5f9447a91a
commit cabcfb874e
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hack/jenkins/build.sh
View File

@ -38,9 +38,16 @@ export CLOUDSDK_COMPONENT_MANAGER_DISABLE_UPDATE_CHECK=true
# FEDERATION? # FEDERATION?
: ${FEDERATION:="false"} : ${FEDERATION:="false"}
: ${RELEASE_INFRA_PUSH:="false"}
: ${KUBE_RELEASE_RUN_TESTS:="n"} : ${KUBE_RELEASE_RUN_TESTS:="n"}
export KUBE_RELEASE_RUN_TESTS RELEASE_INFRA_PUSH FEDERATION
# 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.
@ -67,14 +74,17 @@ elif ${RELEASE_INFRA_PUSH-}; then
if [[ ! -x ${release_infra_clone}/push-ci-build.sh ]]; then if [[ ! -x ${release_infra_clone}/push-ci-build.sh ]]; then
echo "FATAL: Something went wrong." \ echo "FATAL: Something went wrong." \
"${release_infra_clone}/push-ci-build.sh isn't available. Exiting..." >&2 "${release_infra_clone}/push-ci-build.sh isn't available." \
"Exiting..." >&2
exit 1 exit 1
fi fi
[[ -n "$KUBE_GCS_RELEASE_BUCKET" ]] \
&& bucket_flag="--bucket=$KUBE_GCS_RELEASE_BUCKET"
${FEDERATION} && federation_flag="--federation" ${FEDERATION} && federation_flag="--federation"
# Use --nomock to do the real thing ${SET_NOMOCK_FLAG} && mock_flag="--nomock"
#$release_infra_clone/push-ci-build.sh --nomock ${federation_flag-} ${release_infra_clone}/push-ci-build.sh ${bucket_flag-} ${federation_flag-} \
${release_infra_clone}/push-ci-build.sh ${federation_flag-} ${mock_flag-}
else else
./build/push-ci-build.sh ./build/push-ci-build.sh
fi fi