Merge pull request kubernetes#35458 from ixdy/automated-cherry-pick-of-#28922-kubernetes#29892-kubernetes#30182-kubernetes#31025-kubernetes#32013-kubernetes#32235-kubernetes#34359-kubernetes#35233-upstream-release-1.3

ixdy · web-flow · commit 9e735dd31454 · 2016-10-25T16:34:35.000-07:00
Automated cherry pick of kubernetes#28922 kubernetes#29892 kubernetes#30182 kubernetes#31025 kubernetes#32013 kubernetes#32235 kubernetes#34359 kubernetes#35233
diff --git a/hack/jenkins/build.sh b/hack/jenkins/build.sh
@@ -36,6 +36,8 @@ export KUBE_SKIP_CONFIRMATIONS=y
 # Skip gcloud update checking
 export CLOUDSDK_COMPONENT_MANAGER_DISABLE_UPDATE_CHECK=true
 
+# FEDERATION?
+: ${FEDERATION:="false"}
 : ${KUBE_RELEASE_RUN_TESTS:="n"}
 export KUBE_RELEASE_RUN_TESTS
 
@@ -54,9 +56,23 @@ git clean -fdx
 # Build
 go run ./hack/e2e.go -v --build
 
-[[ ${KUBE_SKIP_PUSH_GCS:-} =~ ^[yY]$ ]] || {
-    # Push to GCS
-    ./build/push-ci-build.sh
-}
+# Push to GCS?
+if [[ ${KUBE_SKIP_PUSH_GCS:-} =~ ^[yY]$ ]]; then
+  echo "Not pushed to GCS..."
+else
+  readonly release_infra_clone="${WORKSPACE}/_tmp/release.git"
+  mkdir -p ${WORKSPACE}/_tmp
+  git clone https://github.com/kubernetes/release ${release_infra_clone}
+
+  push_build=${release_infra_clone}/push-build.sh
+
+  [[ -n "${KUBE_GCS_RELEASE_BUCKET-}" ]] \
+    && bucket_flag="--bucket=${KUBE_GCS_RELEASE_BUCKET-}"
+  ${FEDERATION} && federation_flag="--federation"
+  [[ -n "${KUBE_GCS_RELEASE_SUFFIX-}" ]] \
+    && gcs_suffix_flag="--gcs-suffix=${KUBE_GCS_RELEASE_SUFFIX-}"
+  ${push_build} ${bucket_flag-} ${federation_flag-} ${gcs_suffix_flag-} \
+    --nomock --verbose --ci
+fi
 
 sha256sum _output/release-tars/kubernetes*.tar.gz
