From 0b4ee02189397d40883fe67070d84d9170591fca Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Tue, 24 Mar 2020 10:23:49 -0700 Subject: [PATCH] look for version in bazel-bin bazel-bin and bazel-genfiles have pointed to the same location since 0.25. -genfiles is deprecated. This was test running: ../test-infra/scenarios/kubernetes_bazel.py --push With bazel version 2.2.0 and 0.23.2. Issue: https://github.com/bazelbuild/bazel/issues/8651 --- scenarios/kubernetes_bazel.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scenarios/kubernetes_bazel.py b/scenarios/kubernetes_bazel.py index 37606f2b576a..ae83a32675e7 100755 --- a/scenarios/kubernetes_bazel.py +++ b/scenarios/kubernetes_bazel.py @@ -116,7 +116,13 @@ def echo_result(res): def get_version(): """Return kubernetes version""" - with open('bazel-genfiles/version') as fp: + # 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 os.path.isfile('bazel-genfiles/version'): + with open('bazel-genfiles/version') as fp: + return fp.read().strip() + with open('bazel-bin/version') as fp: return fp.read().strip() def get_changed(base, pull):