Add workaround to find kubectl binary on MacOS

kubernetes-sigs · Apr 29, 2020 · 59fda7b · 59fda7b
1 parent 7177d6a
commit 59fda7b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/scripts/ci-conformance.sh b/scripts/ci-conformance.sh
@@ -55,14 +55,16 @@ build_k8s() {
     # ensure the e2e script will find our binaries ...
     mkdir -p "${PWD}/_output/bin/"
     cp -f "${PWD}/bazel-bin/test/e2e/e2e.test" "${PWD}/_output/bin/e2e.test"
-    # workaround for mac os
-    cp -f "${PWD}/bazel-bin/vendor/github.com/onsi/ginkgo/ginkgo/darwin_amd64_stripped/ginkgo" "${PWD}/_output/bin/ginkgo" || true
+    # workarounds for mac os
+    cp -f "${PWD}/bazel-bin/vendor/github.com/onsi/ginkgo/ginkgo/darwin_amd64_stripped/ginkgo" "${PWD}/_output/bin/ginkgo" 2>/dev/null || true
+    cp -f "${PWD}/bazel-bin/cmd/kubectl/darwin_amd64_pure_stripped/kubectl" "${PWD}/_output/bin/kubectl" 2>/dev/null || true
+
     PATH="$(dirname "$(find "${PWD}/bazel-bin/" -name kubectl -type f)"):${PATH}"
     export PATH
 
     # attempt to release some memory after building
     sync || true
-    echo 1 > /proc/sys/vm/drop_caches || true
+    (echo 1 > /proc/sys/vm/drop_caches) 2>/dev/null || true
 
     popd
 }