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

Merge pull request #29892 from david-mcmahon/jenkins2 

Automatic merge from submit-queue

Clone kubernetes/release into something other than /release due to conflict with /release.

It looks like $WORKSPACE is the root of the kubernetes clone.  I think ideally we'd move that down a level and allow subdirectories of different repos.  I think this may become the norm as we split things up further as well.  What do you think and how should we proceed here?  @ixdy @spxtr
pull/6/head
Kubernetes Submit Queue 2016-08-02 16:24:07 -07:00 committed by GitHub
parent fa5f3b816e eceef16b9f
commit 31ff5d423d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hack/jenkins/build.sh
View File

@ -60,20 +60,21 @@ go run ./hack/e2e.go -v --build
# Push to GCS? # Push to GCS?
if [[ ${KUBE_SKIP_PUSH_GCS:-} =~ ^[yY]$ ]]; then if [[ ${KUBE_SKIP_PUSH_GCS:-} =~ ^[yY]$ ]]; then
echo "Not pushed to GCS..." echo "Not pushed to GCS..."
elif $RELEASE_INFRA_PUSH; then elif ${RELEASE_INFRA_PUSH-}; then
git clone https://github.com/kubernetes/release $WORKSPACE/release readonly release_infra_clone="${WORKSPACE}/_tmp/release.git"
readonly release_infra_clone=$WORKSPACE/release mkdir -p ${WORKSPACE}/_tmp
git clone https://github.com/kubernetes/release ${release_infra_clone}
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
$FEDERATION && federation_flag="--federation" ${FEDERATION} && federation_flag="--federation"
# Use --nomock to do the real thing # Use --nomock to do the real thing
#$release_infra_clone/push-ci-build.sh --nomock ${federation_flag-} #$release_infra_clone/push-ci-build.sh --nomock ${federation_flag-}
$release_infra_clone/push-ci-build.sh ${federation_flag-} ${release_infra_clone}/push-ci-build.sh ${federation_flag-}
else else
./build/push-ci-build.sh ./build/push-ci-build.sh
fi fi