@@ -1,4 +1,5 @@

 /_output

+/_tools

 /openshift.local.*

 /.project

 /.vagrant

@@ -8,14 +8,11 @@ env:

  - TEST_ASSETS=false

 install:

-  - ./hack/verify-jsonformat.sh

-  - ./hack/install-etcd.sh

-  - ./hack/install-std-race.sh

-  - ./hack/install-tools.sh

-  - ./hack/build-go.sh

-  - ./hack/install-assets.sh

+  - export PATH=$GOPATH/bin:./_tools/etcd/bin:$PATH

+  - make install-travis

-script: ./hack/test-assets.sh && export TRAVIS_TEST=true && PATH=$HOME/gopath/bin:./_output/etcd/bin:$PATH make check-test WHAT="''" TESTFLAGS="-p=4"

+script:

+  - make check-test TESTFLAGS="-p=4" TESTS="''" # empty quotes are because hack/test-go.sh requires 2 args

 notifications:

   irc: "chat.freenode.net#openshift-dev"

@@ -47,18 +47,11 @@ check:

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

 .PHONY: check

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

-#

-# Args:

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

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

+# Verify code is properly organized.

 #

 # Example:

-#   make check-test

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

-check-test: export KUBE_RACE=  -race

-check-test: build check

-check-test:

+#   make verify

+verify: build

 	hack/verify-gofmt.sh

 	hack/verify-govet.sh

 	hack/verify-generated-deep-copies.sh

@@ -67,8 +60,41 @@ check-test:

 	hack/verify-generated-docs.sh

 	hack/verify-generated-swagger-spec.sh

 	hack/verify-api-descriptions.sh

+.PHONY: 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.

+#

+# Args:

+#   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: verify check

 	hack/test-cmd.sh

 	KUBE_RACE=" " hack/test-integration.sh

+endif

 .PHONY: check-test

 # Build and run the complete test-suite.

@@ -84,19 +110,11 @@ test: export KUBE_COVER= -cover -covermode=atomic

 test: export KUBE_RACE=  -race

 ifeq ($(SKIP_BUILD), true)

 $(info build is being skipped)

-test: check

+test: check verify

 else

-test: build check

+test: build check verify

 endif

 test:

-	hack/verify-gofmt.sh

-	hack/verify-govet.sh

-	hack/verify-generated-deep-copies.sh

-	hack/verify-generated-conversions.sh

-	hack/verify-generated-completions.sh

-	hack/verify-generated-docs.sh

-	hack/verify-generated-swagger-spec.sh

-	hack/verify-api-descriptions.sh

 	hack/test-cmd.sh

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

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

@@ -14600,4 +14600,4 @@

     }

    }

   }

- }

\ No newline at end of file

+ }

@@ -17472,4 +17472,4 @@

     "properties": {}

    }

   }

- }

\ No newline at end of file

+ }

@@ -2,29 +2,39 @@

 set -e

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

-source "${OS_ROOT}/hack/common.sh"

+set -o errexit

+set -o nounset

+set -o pipefail

-mkdir -p "${OS_ROOT}/_output"

-cd "${OS_ROOT}/_output"

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

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

+os::log::install_errexit

-if [ -d etcd ]; then

-    pushd etcd >/dev/null

-    ./build

-    popd >/dev/null

-    exit

-fi

+etcd_version=$(go run ${OS_ROOT}/hack/version.go ${OS_ROOT}/Godeps/Godeps.json github.com/coreos/etcd/etcdserver)

-etcd_version=$(go run ${OS_ROOT}/hack/version.go ${OS_ROOT}/Godeps/Godeps.json \

-  github.com/coreos/etcd/etcdserver)

+mkdir -p "${OS_ROOT}/_tools"

+cd "${OS_ROOT}/_tools"

-mkdir -p etcd && cd etcd

+if [ ! -d etcd ]; then

+  mkdir -p etcd

+  pushd etcd >/dev/null

-curl -s -L https://github.com/coreos/etcd/tarball/${etcd_version} | \

-  tar xz --strip-components 1 2>/dev/null

+  curl -s -L https://github.com/coreos/etcd/tarball/${etcd_version} | \

+    tar xz --strip-components 1 2>/dev/null

-if [ "$?" != "0" ]; then

-  echo "Failed to download coreos/etcd." && exit 1

+  if [ "$?" != "0" ]; then

+    echo "Failed to download coreos/etcd."

+    exit 1

+  fi

+else

+  pushd etcd >/dev/null

 fi

 ./build

+

+echo

+echo Installed coreos/etcd ${etcd_version} into:

+echo export PATH=$(pwd):\$PATH

+

+popd >/dev/null

+exit 0

\ No newline at end of file

@@ -23,13 +23,12 @@ find_test_dirs() {

   find . -not \( \

       \( \

         -wholename './Godeps' \

-        -o -wholename './release' \

-        -o -wholename './target' \

-        -o -wholename '*/Godeps/*' \

-        -o -wholename '*/_output/*' \

+        -o -wholename './_output' \

+        -o -wholename './_tools' \

         -o -wholename './.git' \

-        -o -wholename './assets/node_modules' \

         -o -wholename './openshift.local.*' \

+        -o -wholename '*/Godeps/*' \

+        -o -wholename './assets/node_modules' \

         -o -wholename './test/extended' \

       \) -prune \

     \) -name '*_test.go' -print0 | xargs -0n1 dirname | sort -u | xargs -n1 printf "${OS_GO_PACKAGE}/%s\n"

@@ -28,7 +28,7 @@ tags="${OS_TEST_TAGS:-integration !docker etcd}"

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

 TMPDIR=${TMPDIR:-/tmp}

-export BASETMPDIR=${BASETMPDIR:-"${TMPDIR}/openshift-integration"}

+export BASETMPDIR=${BASETMPDIR:-${TMPDIR}/openshift-integration}

 echo

 echo "Test ${package} -tags='${tags}' ..."

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

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

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

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

+if [[ "${platform}" != "linux/amd64" ]]; then

+  echo "WARNING: Completions cannot be updated on non-Linux systems (${platform}) due to static link dependencies"

+  exit 1

+fi

+

 "${OS_ROOT}/hack/build-go.sh" cmd/genbashcomp

 # Find binary

@@ -43,9 +43,17 @@ SWAGGER_API_PATH="${HOST}/swaggerapi/"

 # Prevent user environment from colliding with the test setup

 unset KUBECONFIG

-# set path so OpenShift is available

-GO_OUT="${OS_ROOT}/_output/local/go/bin"

-export PATH="${GO_OUT}:${PATH}"

+openshift=$(cd "${OS_ROOT}"; echo "$(pwd)/_output/local/go/bin/openshift")

+

+if [[ ! -e "${openshift}" ]]; then

+  {

+    echo "It looks as if you don't have a compiled openshift binary"

+    echo

+    echo "If you are running from a clone of the git repo, please run"

+    echo "'./hack/build-go.sh'."

+  } >&2

+  exit 1

+fi

 # create temp dir

 TEMP_DIR=${USE_TEMP:-$(mktemp -d /tmp/openshift-cmd.XXXX)}

@@ -54,7 +62,7 @@ export CURL_CA_BUNDLE="${TEMP_DIR}/openshift.local.config/master/ca.crt"

 # Start openshift

 echo "Starting OpenShift..."

 pushd "${TEMP_DIR}" > /dev/null

-OPENSHIFT_ON_PANIC=crash openshift start master --listen="https://0.0.0.0:8443" --master="https://127.0.0.1:8443" &> /dev/null &

+OPENSHIFT_ON_PANIC=crash "${openshift}" start master --master="https://127.0.0.1:8443" >/dev/null 2>&1  &

 OS_PID=$!

 popd > /dev/null

@@ -65,11 +73,11 @@ echo "Updating ${SWAGGER_SPEC_OUT_DIR}:"

 ENDPOINT_TYPES="oapi api"

 for type in $ENDPOINT_TYPES

 do

-    ENDPOINTS=$(curl "${HOST}" | grep -Po "(?<=\/${type}\/)[a-z0-9]+" | sed '/v1beta3/d')

+    ENDPOINTS=(v1)

     for endpoint in $ENDPOINTS

     do

         echo "Updating ${SWAGGER_SPEC_OUT_DIR}/${type}-${endpoint}.json from ${SWAGGER_API_PATH}${type}/${endpoint}..."

-        curl "${SWAGGER_API_PATH}${type}/${endpoint}" > "${SWAGGER_SPEC_OUT_DIR}/${type}-${endpoint}.json"    

+        curl -w "\n" "${SWAGGER_API_PATH}${type}/${endpoint}" > "${SWAGGER_SPEC_OUT_DIR}/${type}-${endpoint}.json"

     done

 done

 echo "SUCCESS"

@@ -5,10 +5,9 @@

 TIME_SEC=1000

 TIME_MIN=$((60 * $TIME_SEC))

-# setup_env_vars exports all the necessary environment variables for configuring and  

+# setup_env_vars exports all the necessary environment variables for configuring and

 # starting OS server.

 function setup_env_vars {

-  export TRAVIS_TEST="${TRAVIS_TEST:-false}"

   export ETCD_DATA_DIR="${BASETMPDIR}/etcd"

   export VOLUME_DIR="${BASETMPDIR}/volumes"

   export FAKE_HOME_DIR="${BASETMPDIR}/openshift.local.home"

@@ -324,8 +323,11 @@ function start_etcd {

   set +e

   if [ "$(which etcd)" == "" ]; then

-    echo "etcd must be in your PATH"

-    exit 1

+    if [[ ! -f ${OS_ROOT}/_tools/etcd/bin/etcd ]]; then

+      echo "etcd must be in your PATH or installed in _tools/etcd/bin/ with hack/install-etcd.sh"

+      exit 1

+    fi

+    export PATH="${OS_ROOT}/_tools/etcd/bin:$PATH"

   fi

   running_etcd=$(ps -ef | grep etcd | grep -c name)

@@ -683,14 +685,12 @@ os::log::status() {

 find_files() {

   find . -not \( \

       \( \

-        -wholename './output' \

-        -o -wholename './_output' \

+        -wholename './_output' \

+        -o -wholename './_tools' \

         -o -wholename './.*' \

-        -o -wholename './release' \

         -o -wholename './pkg/assets/bindata.go' \

         -o -wholename './pkg/assets/*/bindata.go' \

-        -o -wholename './target' \

-        -o -wholename '*/third_party/*' \

+        -o -wholename './openshift.local.*' \

         -o -wholename '*/Godeps/*' \

       \) -prune \

     \) -name '*.go' | sort -u

@@ -1,6 +1,6 @@

 #!/bin/bash

-set -e

+set -o errexit

 set -o nounset

 set -o pipefail

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

 echo "===== Verifying Generated Completions ====="

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

+if [[ "${platform}" != "linux/amd64" ]]; then

+  echo "WARNING: Completions cannot be verified on non-Linux systems (${platform})"

+  exit 0

+fi

+

 COMPLETION_ROOT_REL="rel-eng/completions"

 COMPLETION_ROOT="${OS_ROOT}/${COMPLETION_ROOT_REL}"

-TMP_COMPLETION_ROOT_REL="_tmp/verify-generated-completions/"

+TMP_COMPLETION_ROOT_REL="_output/verify-generated-completions/"

 TMP_COMPLETION_ROOT="${OS_ROOT}/${TMP_COMPLETION_ROOT_REL}/${COMPLETION_ROOT_REL}"

 echo "Generating fresh completions..."

@@ -1,6 +1,6 @@

 #!/bin/bash

-set -e

+set -o errexit

 set -o nounset

 set -o pipefail

@@ -34,7 +34,7 @@ fi

 APIROOT_REL="pkg/api"

 APIROOT="${OS_ROOT}/${APIROOT_REL}"

-TMP_APIROOT_REL="_tmp/verify-generated-conversions"

+TMP_APIROOT_REL="_output/verify-generated-conversions"

 TMP_APIROOT="${OS_ROOT}/${TMP_APIROOT_REL}/${APIROOT_REL}"

 echo "Generating fresh conversions..."

@@ -45,7 +45,7 @@ then

   exit 1

 fi

-cp -au "${APIROOT}" "${TMP_APIROOT}/.."

+rsync -au "${APIROOT}" "${TMP_APIROOT}/.."

 echo "Diffing current conversions against freshly generated conversions..."

 ret=0

@@ -1,6 +1,6 @@

 #!/bin/bash

-set -e

+set -o errexit

 set -o nounset

 set -o pipefail

@@ -34,7 +34,7 @@ fi

 APIROOT_REL="pkg/api"

 APIROOT="${OS_ROOT}/${APIROOT_REL}"

-TMP_APIROOT_REL="_tmp/verify-generated-deep-copies"

+TMP_APIROOT_REL="_output/verify-generated-deep-copies"

 TMP_APIROOT="${OS_ROOT}/${TMP_APIROOT_REL}/${APIROOT_REL}"

 echo "Generating fresh deep copies..."

@@ -45,7 +45,7 @@ then

   exit 1

 fi

-cp -au "${APIROOT}" "${TMP_APIROOT}/.."

+rsync -au "${APIROOT}" "${TMP_APIROOT}/.."

 echo "Diffing current deep copies against freshly generated deep copies..."

 ret=0

@@ -1,6 +1,6 @@

 #!/bin/bash

-set -e

+set -o errexit

 set -o nounset

 set -o pipefail

@@ -13,7 +13,7 @@ echo "===== Verifying Generated Docs ====="

 GENERATED_DOCS_ROOT_REL="docs/generated"

 GENERATED_DOCS_ROOT="${OS_ROOT}/${GENERATED_DOCS_ROOT_REL}"

-TMP_GENERATED_DOCS_ROOT_REL="_tmp/verify-generated-docs"

+TMP_GENERATED_DOCS_ROOT_REL="_output/verify-generated-docs"

 TMP_GENERATED_DOCS_ROOT="${OS_ROOT}/${TMP_GENERATED_DOCS_ROOT_REL}/${GENERATED_DOCS_ROOT_REL}"

 echo "Generating fresh docs..."

@@ -1,6 +1,6 @@

 #!/bin/bash

-set -e

+set -o errexit

 set -o nounset

 set -o pipefail

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

 cd "${OS_ROOT}"

-echo "===== Verifying Swagger Spec ====="

+echo "===== Verifying API Swagger Spec ====="

 SPECROOT_REL="api/swagger-spec"

 SPECROOT="${OS_ROOT}/${SPECROOT_REL}"

-REL_TMP_PATH="_tmp/verify-generated-swagger-spec"

+REL_TMP_PATH="_output/verify-generated-swagger-spec"

 TMP_SPECROOT="${OS_ROOT}/${REL_TMP_PATH}/${SPECROOT_REL}"

 echo "Generating a fresh spec..."

@@ -21,6 +21,7 @@ if ! output=`${OS_ROOT}/hack/update-generated-swagger-spec.sh ${REL_TMP_PATH} 2>

 then

 	echo "FAILURE: Generation of fresh spec failed:"

 	echo "$output"

+  exit 1

 fi

 echo "Diffing current spec against freshly generated spec..."

@@ -18,7 +18,7 @@ cd "${OS_ROOT}"

 mkdir -p _output/govet

 FAILURE=false

-test_dirs=$(find_files | cut --delimiter=/ --fields=1-2 | sort -u)

+test_dirs=$(find_files | cut -d '/' -f 1-2 | sort -u)

 for test_dir in $test_dirs

 do

   go tool vet -shadow=false \

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

 	"github.com/golang/glog"

 	"github.com/spf13/cobra"

 	kclient "k8s.io/kubernetes/pkg/client"

+	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

 	osclient "github.com/openshift/origin/pkg/client"

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

@@ -23,7 +24,7 @@ func NewCmdValidateToken(f *clientcmd.Factory) *cobra.Command {

 			clientCfg, err := f.OpenShiftClientConfig.ClientConfig()

 			if err != nil {

-				fmt.Errorf("%v\n", err)

+				cmdutil.CheckErr(fmt.Errorf("%v", err))

 			}

 			validateToken(tokenValue, clientCfg)

@@ -76,9 +77,9 @@ func getTokenInfo(token string, osClient *osclient.Client) (string, *osintypes.I

 	}

 	body, err := osResult.Raw()

 	if err != nil {

-		return "", nil, fmt.Errorf("Error reading info response: %v\n", err)

+		return "", nil, fmt.Errorf("Error reading info response: %v", err)

 	}

-	glog.V(1).Infof("Raw JSON: %v\n", string(body))

+	glog.V(1).Infof("Raw JSON: %s", string(body))

 	var accessData osintypes.InfoResponseData

 	err = json.Unmarshal(body, &accessData)

@@ -86,10 +87,10 @@ func getTokenInfo(token string, osClient *osclient.Client) (string, *osintypes.I

 		return "", nil, fmt.Errorf("Error while unmarshalling info response: %v %v", err, string(body))

 	}

 	if accessData.Error == "invalid_request" {

-		return "", nil, fmt.Errorf("\"%v\" is not a valid token.\n", token)

+		return "", nil, fmt.Errorf("%q is not a valid token.", token)

 	}

 	if len(accessData.ErrorDescription) != 0 {

-		return "", nil, fmt.Errorf("%v\n", accessData.ErrorDescription)

+		return "", nil, fmt.Errorf("%s", accessData.ErrorDescription)

 	}

 	return string(body), &accessData, nil