Merge pull request #34359 from ixdy/build-gcs-dir-suffix

Automatic merge from submit-queue Add support for adding a suffix to the GCS upload dir in jenkins/build Second step of fixing kubernetes/test-infra#670. Sequences after https://github.com/kubernetes/release/pull/135. cc @luxas

Merge pull request #34359 from ixdy/build-gcs-dir-suffix
de55cb85 · Kubernetes Submit Queue · GitHub · c8668df0 · f8ea2132 · de55cb85
Commit de55cb85 authored Oct 08, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

build.sh hack/jenkins/build.sh +5 -2

No files found.
--- a/hack/jenkins/build.sh
+++ b/hack/jenkins/build.sh
@@ -73,9 +73,12 @@ else
    #exit 1
  fi
  [[ -n "${KUBE_GCS_RELEASE_BUCKET-}" ]] \
-   && bucket_flag="--bucket=${KUBE_GCS_RELEASE_BUCKET-}"
+    && bucket_flag="--bucket=${KUBE_GCS_RELEASE_BUCKET-}"
  ${FEDERATION} && federation_flag="--federation"
-  ${push_build} ${bucket_flag-} ${federation_flag-} --nomock --verbose --ci
+  [[ -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