Skip to content
Permalink
Browse files

Merge pull request #74566 from neolit123/automated-cherry-pick-of-#69…

…548-origin-release-1.12

Automated cherry pick of #69548: Fix find-binary to locate bazel e2e tests
  • Loading branch information...
k8s-ci-robot committed Feb 26, 2019
2 parents b77eaeb + 14cc9fe commit ab91afd7062d4240e95e51ac00a18bd58fddd365
Showing with 2 additions and 2 deletions.
  1. +2 −2 hack/lib/util.sh
@@ -163,11 +163,11 @@ kube::util::find-binary-for-platform() {
"${KUBE_ROOT}/platforms/${platform}/${lookfor}"
)
# Also search for binary in bazel build tree.
# The bazel go rules place binaries in subtrees like
# The bazel go rules place some binaries in subtrees like
# "bazel-bin/source/path/linux_amd64_pure_stripped/binaryname", so make sure
# the platform name is matched in the path.
locations+=($(find "${KUBE_ROOT}/bazel-bin/" -type f -executable \
-path "*/${platform/\//_}*/${lookfor}" 2>/dev/null || true) )
\( -path "*/${platform/\//_}*/${lookfor}" -o -path "*/${lookfor}" \) 2>/dev/null || true) )

# List most recently-updated location.
local -r bin=$( (ls -t "${locations[@]}" 2>/dev/null || true) | head -1 )

0 comments on commit ab91afd

Please sign in to comment.
You can’t perform that action at this time.