scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 12:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip e2e test for Mac.

Browse Source
This commit is contained in:
Klaus Ma
2017-03-26 09:32:44 +08:00
parent 6a529f700a
commit c6e79167f4
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hack/lib/golang.sh
View File

@@ -158,11 +158,20 @@ readonly KUBE_TEST_PORTABLE=(
# need to target server platforms. # need to target server platforms.
# These binaries will be distributed in the kubernetes-test tarball. # These binaries will be distributed in the kubernetes-test tarball.
# If you update this list, please also update build/release-tars/BUILD. # If you update this list, please also update build/release-tars/BUILD.
readonly KUBE_TEST_SERVER_TARGETS=( kube::golang::server_test_targets() {
local targets=(
cmd/kubemark cmd/kubemark
vendor/github.com/onsi/ginkgo/ginkgo vendor/github.com/onsi/ginkgo/ginkgo
test/e2e_node/e2e_node.test
) )
if [[ "${OSTYPE:-}" == "linux"* ]]; then
targets+=( test/e2e_node/e2e_node.test )
fi
echo "${targets[@]}"
}
readonly KUBE_TEST_SERVER_TARGETS=($(kube::golang::server_test_targets))
readonly KUBE_TEST_SERVER_BINARIES=("${KUBE_TEST_SERVER_TARGETS[@]##*/}") readonly KUBE_TEST_SERVER_BINARIES=("${KUBE_TEST_SERVER_TARGETS[@]##*/}")
readonly KUBE_TEST_SERVER_PLATFORMS=("${KUBE_SERVER_PLATFORMS[@]}") readonly KUBE_TEST_SERVER_PLATFORMS=("${KUBE_SERVER_PLATFORMS[@]}")
@@ -487,7 +496,6 @@ kube::golang::build_binaries_for_platform() {
V=2 kube::log::info "Env for ${platform}: GOOS=${GOOS-} GOARCH=${GOARCH-} GOROOT=${GOROOT-} CGO_ENABLED=${CGO_ENABLED-} CC=${CC-} GO=${GO}" V=2 kube::log::info "Env for ${platform}: GOOS=${GOOS-} GOARCH=${GOARCH-} GOROOT=${GOROOT-} CGO_ENABLED=${CGO_ENABLED-} CC=${CC-} GO=${GO}"
for binary in "${binaries[@]}"; do for binary in "${binaries[@]}"; do
if [[ "${binary}" =~ ".test"$ ]]; then if [[ "${binary}" =~ ".test"$ ]]; then
tests+=($binary) tests+=($binary)
elif kube::golang::is_statically_linked_library "${binary}"; then elif kube::golang::is_statically_linked_library "${binary}"; then