@@ -8,7 +8,8 @@ env:

  - TEST_ASSETS=false

 install:

-  - PATH=$HOME/gopath/bin:$PATH make install-travis

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

+  - make install-travis

 script:

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

@@ -47,6 +47,21 @@ check:

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

 .PHONY: check

+# Verify code is properly organized.

+#

+# Example:

+#   make verify

+verify: build

+	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

+.PHONY: verify

+

 # Install travis dependencies

 #

 # Args:

@@ -61,7 +76,7 @@ install-travis:

 endif

 .PHONY: install-travis

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

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

 #

 # Args:

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

@@ -76,16 +91,7 @@ ifeq ($(TEST_ASSETS), true)

 check-test:

 	hack/test-assets.sh

 else

-check-test: build check

-check-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

+check-test: verify check

 	hack/test-cmd.sh

 	KUBE_RACE=" " hack/test-integration.sh

 endif

@@ -104,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

+ }

@@ -17456,4 +17456,4 @@

     "properties": {}

    }

   }

- }

\ No newline at end of file

+ }

@@ -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"

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

 #!/bin/bash

-set -e

+set -o errexit

 set -o nounset

 set -o pipefail

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

 #!/bin/bash

-set -e

+set -o errexit

 set -o nounset

 set -o pipefail

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

 #!/bin/bash

-set -e

+set -o errexit

 set -o nounset

 set -o pipefail

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

 #!/bin/bash

-set -e

+set -o errexit

 set -o nounset

 set -o pipefail

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

 #!/bin/bash

-set -e

+set -o errexit

 set -o nounset

 set -o pipefail

@@ -9,7 +9,7 @@ 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}"

@@ -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..."