Merge pull request #27482 from quinton-hoole/2016-06-15-build-darwin-test-binaries-on-os-x

Automatic merge from submit-queue

Build Darwin test binaries on OS X when KUBE_FASTBUILD is set

Without this, on OS X, test binaries would not be built for the local ARCH, and test scripts fail with an obscure error due to not being able to find the correct binary to run.

This makes the behavior on OS X more consistent with Linux.

Tested on OS X and Linux.
This commit is contained in:
k8s-merge-robot
2016-06-24 13:57:04 -07:00
committed by GitHub

View File

@@ -53,13 +53,17 @@ readonly KUBE_SERVER_BINARIES=("${KUBE_SERVER_TARGETS[@]##*/}")
if [[ "${KUBE_FASTBUILD:-}" == "true" ]]; then
readonly KUBE_SERVER_PLATFORMS=(linux/amd64)
readonly KUBE_TEST_PLATFORMS=(linux/amd64)
if [[ "${KUBE_BUILDER_OS:-}" == "darwin"* ]]; then
readonly KUBE_TEST_PLATFORMS=(
darwin/amd64
linux/amd64
)
readonly KUBE_CLIENT_PLATFORMS=(
darwin/amd64
linux/amd64
)
else
readonly KUBE_TEST_PLATFORMS=(linux/amd64)
readonly KUBE_CLIENT_PLATFORMS=(linux/amd64)
fi
else