Merge pull request #1314 from justaugustus/test-cluster-up

push-build: look for version in bazel-bin

push-build.sh

@@ -121,11 +121,18 @@ RELEASE_BUCKET=${FLAGS_bucket:-"kubernetes-release-dev"}
 # This will canonicalize the path
 KUBE_ROOT=$(pwd -P)
 
+# TODO: this should really just read the version from the release tarball always
 USE_BAZEL=false
 if release::was_built_with_bazel $KUBE_ROOT $FLAGS_release_kind; then
   USE_BAZEL=true
-  bazel build //:version
-  LATEST=$(cat $KUBE_ROOT/bazel-genfiles/version)
+  # The check for version in bazel-genfiles can be removed once everyone is off
+  # of versions before 0.25.0.
+  # https://github.com/bazelbuild/bazel/issues/8651
+  if [[ -r  "$KUBE_ROOT/bazel-genfiles/version" ]]; then
+    LATEST=$(cat $KUBE_ROOT/bazel-genfiles/version)
+  else
+    LATEST=$(cat $KUBE_ROOT/bazel-bin/version)
+  fi
 else
   LATEST=$(tar -O -xzf $KUBE_ROOT/_output/release-tars/$FLAGS_release_kind.tar.gz $FLAGS_release_kind/version)
 fi