@@ -25,6 +25,7 @@ import (

 	"net/http/httptest"

 	"net/url"

 	"reflect"

+	"runtime"

 	"strings"

 	"sync"

 	"testing"

@@ -280,6 +281,9 @@ func fakePortForwardServer(t *testing.T, testName string, serverSends, expectedF

 }

 func TestForwardPorts(t *testing.T) {

+	if runtime.GOOS == "darwin" {

+		t.Skipf("does not work on IPv6 systems")

+	}

 	tests := map[string]struct {

 		ports       []string

 		clientSends map[uint16]string

@@ -21,6 +21,7 @@ import (

 	"net/http"

 	"net/http/httptest"

 	"net/url"

+	"runtime"

 	"strconv"

 	"strings"

 	"testing"

@@ -39,6 +40,9 @@ func containsAny(s string, substrs []string) bool {

 }

 func TestTcpHealthChecker(t *testing.T) {

+	if runtime.GOOS == "darwin" {

+		t.Skipf("doesn't work on Macs")

+	}

 	prober := New()

 	tests := []struct {

 		expectedStatus probe.Result

@@ -31,31 +31,20 @@ all build:

 	hack/build-go.sh $(WHAT)

 .PHONY: all build

-# Build and run unit tests

-#

-# Args:

-#   WHAT: Directory names to test.  All *_test.go files under these

-#     directories will be run.  If not specified, "everything" will be tested.

-#   TESTS: Same as WHAT.

-#   GOFLAGS: Extra flags to pass to 'go' when building.

-#   TESTFLAGS: Extra flags that should only be passed to hack/test-go.sh

+# Run core verification and all self contained tests.

 #

 # Example:

 #   make check

-#   make check WHAT=pkg/build GOFLAGS=-v

-check:

-	TEST_KUBE=1 hack/test-go.sh $(WHAT) $(TESTS) $(TESTFLAGS)

+check: | build verify

+	$(MAKE) test-unit test-cmd -o build -o verify

 .PHONY: check

-# Verify code is properly organized.

+

+# Verify code conventions are properly setup.

 #

 # Example:

 #   make verify

-ifeq ($(SKIP_BUILD), true)

-verify:

-else

 verify: build

-endif

 	hack/verify-upstream-commits.sh

 	hack/verify-gofmt.sh

 	hack/verify-govet.sh

@@ -66,91 +55,76 @@ endif

 	hack/verify-generated-swagger-spec.sh

 .PHONY: verify

-# check and verify can't run concurently because of strange concurrent build issues.

-check-verify:

-	# delegate to another make process that runs serially against the check and verify targets

-	$(MAKE) -j1 check verify

-.PHONY: check-verify

-

-# Install travis dependencies

-#

-# Args:

-#   TEST_ASSETS: Instead of running tests, test assets only.

-ifeq ($(TEST_ASSETS), true)

-install-travis:

-	hack/install-assets.sh

-else

-install-travis:

-	hack/install-etcd.sh

-	hack/install-tools.sh

-endif

-.PHONY: install-travis

-

-# Run unit and integration tests that don't require Docker.

+# Run unit tests.

 #

 # Args:

+#   WHAT: Directory names to test.  All *_test.go files under these

+#     directories will be run.  If not specified, "everything" will be tested.

+#   TESTS: Same as WHAT.

 #   GOFLAGS: Extra flags to pass to 'go' when building.

 #   TESTFLAGS: Extra flags that should only be passed to hack/test-go.sh

-#   TEST_ASSETS: Instead of running tests, test assets only.

 #

 # Example:

-#   make check-test

-check-test: export KUBE_COVER= -cover -covermode=atomic

-check-test: export KUBE_RACE=  -race

-ifeq ($(TEST_ASSETS), true)

-check-test:

-	hack/test-assets.sh

-else

-check-test: 

-	check-verify

-	hack/test-cmd.sh

-	KUBE_RACE=" " hack/test-integration.sh

-endif

-.PHONY: check-test

+#   make test-unit

+#   make test-unit WHAT=pkg/build GOFLAGS=-v

+test-unit:

+	TEST_KUBE=1 hack/test-go.sh $(WHAT) $(TESTS) $(TESTFLAGS)

+.PHONY: test-unit

-# Build and run the complete test-suite.

-#

-# Args:

-#   GOFLAGS: Extra flags to pass to 'go' when building.

-#   TESTFLAGS: Extra flags that should only be passed to hack/test-go.sh

+# Run integration tests. Compiles its own tests, cannot be run

+# in parallel with any other go compilation.

 #

 # Example:

-#   make test

-#   make test GOFLAGS=-v

-test: export KUBE_COVER= -cover -covermode=atomic

-test: export KUBE_RACE=  -race

-ifeq ($(SKIP_BUILD), true)

-test: check-verify test-int-plus

-else

-test: build check-verify test-int-plus

-endif

-.PHONY: test

+#   make test-integration

+test-integration:

+	KUBE_COVER=" " KUBE_RACE=" " hack/test-integration.sh

+.PHONY: test-integration

-# Split out of `test`.  This allows `make -j --output-sync=recurse test` to parallelize as expected

-test-int-plus: export KUBE_COVER= -cover -covermode=atomic

-test-int-plus: export KUBE_RACE=  -race

-ifeq ($(SKIP_BUILD), true)

-test-int-plus: 

-else

-test-int-plus: build

-endif

-test-int-plus:

+# Run command tests. Uses whatever binaries are currently built.

+#

+# Example:

+#   make test-cmd

+test-cmd: build

 	hack/test-cmd.sh

+.PHONY: test-cmd

+

+# Run end to end tests. Uses whatever binaries are currently built.

+#

+# Example:

+#   make test-cmd

+test-end-to-end: build

+	hack/test-end-to-end.sh

+.PHONY: test-end-to-end

+

+# Run tools tests.

+#

+# Example:

+#   make test-cmd

+test-tools:

 	hack/test-tools.sh

-	KUBE_RACE=" " hack/test-integration-docker.sh

-	hack/test-end-to-end-docker.sh

-ifeq ($(EXTENDED),true)

-	hack/test-extended.sh

+.PHONY: test-tools

+

+test-assets:

+ifeq ($(TEST_ASSETS),true)

+	hack/test-assets.sh

 endif

-.PHONY: test-int-plus

+.PHONY: test-assets

+# Build and run the complete test-suite.

+#

+# Example:

+#   make test

+test: check

+	$(MAKE) test-tools test-integration test-assets -o build

+	$(MAKE) test-end-to-end -o build

+.PHONY: test

 # Run All-in-one OpenShift server.

 #

 # Example:

 #   make run

-OS_OUTPUT_BINPATH=$(shell bash -c 'source hack/common.sh; echo $${OS_OUTPUT_BINPATH}')

-PLATFORM=$(shell bash -c 'source hack/common.sh; os::build::host_platform')

+run: export OS_OUTPUT_BINPATH=$(shell bash -c 'source hack/common.sh; echo $${OS_OUTPUT_BINPATH}')

+run: export PLATFORM=$(shell bash -c 'source hack/common.sh; os::build::host_platform')

 run: build

 	$(OS_OUTPUT_BINPATH)/$(PLATFORM)/openshift start

 .PHONY: run

@@ -181,3 +155,10 @@ release-binaries: clean

 	hack/build-release.sh

 	hack/extract-release.sh

 .PHONY: release-binaries

+

+# Install travis dependencies

+#

+install-travis:

+	hack/install-tools.sh

+.PHONY: install-travis

+

@@ -12,6 +12,22 @@ source "${OS_ROOT}/hack/common.sh"

 source "${OS_ROOT}/hack/util.sh"

 os::log::install_errexit

+# only works on Linux for now, all other platforms must build binaries themselves

+if [[ -z "$@" ]]; then

+  if os::build::detect_local_release_tars $(os::build::host_platform_friendly) >/dev/null; then

+    platform=$(os::build::host_platform)

+    echo "++ Using release artifacts from ${OS_RELEASE_COMMIT} for ${platform} instead of building"

+    mkdir -p "${OS_OUTPUT_BINPATH}/${platform}"

+    tar mxzf "${OS_PRIMARY_RELEASE_TAR}" --strip-components=1 -C "${OS_OUTPUT_BINPATH}/${platform}"

+    tar mxzf "${OS_CLIENT_RELEASE_TAR}" --strip-components=1 -C "${OS_OUTPUT_BINPATH}/${platform}"

+    tar mxzf "${OS_IMAGE_RELEASE_TAR}" --strip-components=1 -C "${OS_OUTPUT_BINPATH}/${platform}"

+

+    os::build::make_openshift_binary_symlinks

+

+    ret=$?; ENDTIME=$(date +%s); echo "$0 took $(($ENDTIME - $STARTTIME)) seconds"; exit "$ret"

+  fi

+fi

+

 os::build::build_binaries "$@"

 os::build::place_bins "$@"

 os::build::make_openshift_binary_symlinks

@@ -124,6 +124,25 @@ os::build::host_platform() {

   echo "$(go env GOHOSTOS)/$(go env GOHOSTARCH)"

 }

+# Create a user friendly version of host_platform for end users

+os::build::host_platform_friendly() {

+  local platform=${1:-}

+  if [[ -z "${platform}" ]]; then

+    platform=$(os::build::host_platform)

+  fi

+  if [[ $platform == "windows/amd64" ]]; then

+    echo "windows"

+  elif [[ $platform == "darwin/amd64" ]]; then

+    echo "mac"

+  elif [[ $platform == "linux/386" ]]; then

+    echo "linux-32bit"

+  elif [[ $platform == "linux/amd64" ]]; then

+    echo "linux-64bit"

+  else

+    echo "$(go env GOHOSTOS)-$(go env GOHOSTARCH)"

+  fi

+}

+

 # Build binaries targets specified

 #

 # Input:

@@ -444,26 +463,33 @@ os::build::detect_local_release_tars() {

   if [[ ! -d "${OS_LOCAL_RELEASEPATH}" ]]; then

     echo "There are no release artifacts in ${OS_LOCAL_RELEASEPATH}"

-    exit 2

+    return 2

   fi

   if [[ ! -f "${OS_LOCAL_RELEASEPATH}/.commit" ]]; then

     echo "There is no release .commit identifier ${OS_LOCAL_RELEASEPATH}"

-    exit 2

+    return 2

   fi

   local primary=$(find ${OS_LOCAL_RELEASEPATH} -maxdepth 1 -type f -name openshift-origin-server-*-${platform}*)

   if [[ $(echo "${primary}" | wc -l) -ne 1 || -z "${primary}" ]]; then

     echo "There should be exactly one ${platform} server tar in $OS_LOCAL_RELEASEPATH"

-    exit 2

+    return 2

+  fi

+

+  local client=$(find ${OS_LOCAL_RELEASEPATH} -maxdepth 1 -type f -name openshift-origin-client-tools-*-${platform}*)

+  if [[ $(echo "${client}" | wc -l) -ne 1 || -z "${primary}" ]]; then

+    echo "There should be exactly one ${platform} client tar in $OS_LOCAL_RELEASEPATH"

+    return 2

   fi

   local image=$(find ${OS_LOCAL_RELEASEPATH} -maxdepth 1 -type f -name openshift-origin-image*-${platform}*)

   if [[ $(echo "${image}" | wc -l) -ne 1 || -z "${image}" ]]; then

     echo "There should be exactly one ${platform} image tar in $OS_LOCAL_RELEASEPATH"

-    exit 3

+    return 2

   fi

   export OS_PRIMARY_RELEASE_TAR="${primary}"

   export OS_IMAGE_RELEASE_TAR="${image}"

+  export OS_CLIENT_RELEASE_TAR="${client}"

   export OS_RELEASE_COMMIT="$(cat ${OS_LOCAL_RELEASEPATH}/.commit)"

 }

@@ -15,10 +15,11 @@ cd "${OS_ROOT}"

 # Copy the linux release archives release back to the local _output/local/bin/linux/amd64 directory.

 # TODO: support different OS's?

-os::build::detect_local_release_tars "linux-64bit"

+os::build::detect_local_release_tars $(os::build::host_platform_friendly)

 mkdir -p "${OS_OUTPUT_BINPATH}/linux/amd64"

 tar mxzf "${OS_PRIMARY_RELEASE_TAR}" --strip-components=1 -C "${OS_OUTPUT_BINPATH}/linux/amd64"

+tar mxzf "${OS_CLIENT_RELEASE_TAR}" --strip-components=1 -C "${OS_OUTPUT_BINPATH}/linux/amd64"

 tar mxzf "${OS_IMAGE_RELEASE_TAR}" --strip-components=1 -C "${OS_OUTPUT_BINPATH}/linux/amd64"

 os::build::make_openshift_binary_symlinks

@@ -27,33 +27,14 @@ function cmd() {

   exit $rc

 }

-# If we are running inside of Travis then do not run the rest of this

-# script unless we want to TEST_ASSETS

-if [[ "${TRAVIS-}" == "true" && "${TEST_ASSETS-}" == "false" ]]; then

-  exit

-fi

-

-# Lock version of npm to work around https://github.com/npm/npm/issues/6309

-if [[ "${TRAVIS-}" == "true" ]]; then

-  cmd "npm install -g npm@2.1.14"

-fi

-

 # Install bower if needed

 if ! which bower > /dev/null 2>&1 ; then

-  if [[ "${TRAVIS-}" == "true" ]]; then

-    cmd "npm install -g bower"

-  else

-    cmd "sudo npm install -g bower"

-  fi

+  cmd "sudo npm install -g bower"

 fi

 # Install grunt if needed

 if ! which grunt > /dev/null 2>&1 ; then

-  if [[ "${TRAVIS-}" == "true" ]]; then

-    cmd "npm install -g grunt-cli"

-  else

-    cmd "sudo npm install -g grunt-cli"

-  fi

+  cmd "sudo npm install -g grunt-cli"

 fi

 pushd ${OS_ROOT}/assets > /dev/null

@@ -11,12 +11,6 @@ source "${OS_ROOT}/hack/common.sh"

 # Go to the top of the tree.

 cd "${OS_ROOT}"

-# If we are running inside of Travis then do not run the rest of this

-# script unless we want to TEST_ASSETS

-if [[ "${TRAVIS-}" == "true" && "${TEST_ASSETS-}" == "false" ]]; then

-  exit

-fi

-

 pushd "${OS_ROOT}/assets" > /dev/null

   grunt test

   grunt build

@@ -9,6 +9,16 @@ set -o pipefail

 STARTTIME=$(date +%s)

 OS_ROOT=$(dirname "${BASH_SOURCE}")/..

+

+if [[ "${TEST_END_TO_END:-}" != "direct" ]]; then

+	if docker version >/dev/null 2>&1; then

+		echo "++ Docker is installed, running hack/test-end-to-end-docker.sh instead."

+		"${OS_ROOT}/hack/test-end-to-end-docker.sh"

+		exit $?

+	fi

+	echo "++ Docker is not installed, running end-to-end against local binaries"

+fi

+

 source "${OS_ROOT}/hack/util.sh"

 source "${OS_ROOT}/hack/lib/log.sh"

 source "${OS_ROOT}/hack/lib/util/environment.sh"

deleted file mode 100755

@@ -1,12 +0,0 @@

-#!/bin/bash

-

-set -o errexit

-set -o nounset

-set -o pipefail

-

-OS_ROOT=$(dirname "${BASH_SOURCE}")/..

-

-# Go to the top of the tree.

-cd "${OS_ROOT}"

-

-OS_TEST_TAGS="integration docker etcd" hack/test-integration.sh $@

@@ -37,7 +37,13 @@ function cleanup() {

 trap cleanup EXIT SIGINT

 package="${OS_TEST_PACKAGE:-test/integration}"

-tags="${OS_TEST_TAGS:-integration !docker etcd}"

+

+if docker version >/dev/null 2>&1; then

+	tags="${OS_TEST_TAGS:-integration docker etcd}"

+else

+	echo "++ Docker not available, running only integration tests without the 'docker' tag"

+	tags="${OS_TEST_TAGS:-integration !docker etcd}"

+fi

 export GOMAXPROCS="$(grep "processor" -c /proc/cpuinfo 2>/dev/null || sysctl -n hw.logicalcpu 2>/dev/null || 1)"

@@ -776,6 +776,14 @@ os::util::sed() {

   fi

 }

+os::util::base64decode() {

+  if [[ "$(go env GOHOSTOS)" == "darwin" ]]; then

+  	base64 -D $@

+  else

+  	base64 -d $@

+  fi

+}

+

 os::util::get_object_assert() {

   local object=$1

   local request=$2

@@ -111,6 +111,6 @@ os::cmd::expect_failure 'oc get dc/ruby-hello-world'

 echo "delete all: ok"

 # service accounts should not be allowed to request new projects

-SA_TOKEN=`oc get sa/builder --template='{{range .secrets}}{{ .name }} {{end}}' | xargs -n 1 oc get secret --template='{{ if .data.token }}{{ .data.token }}{{end}}' | base64 -d -`

+SA_TOKEN=`oc get sa/builder --template='{{range .secrets}}{{ .name }} {{end}}' | xargs -n 1 oc get secret --template='{{ if .data.token }}{{ .data.token }}{{end}}' | os::util::base64decode -`

 os::cmd::expect_failure_and_text "oc new-project --token=${SA_TOKEN} will-fail" 'Error from server: You may not request a new project via this API'