@@ -14,8 +14,8 @@ os::provision::build-origin() {

   # This optimization is intended for devcluster use so hard-coding the

   # arch in the path should be ok.

-  if [[ -f "$(os::build::find-binary oc "${origin_root}")" &&

-          "${skip_build}" = "true" ]]; then

+  if OS_ROOT="${origin_root}" os::util::find::built_binary oc >/dev/null 2>&1 &&

+          [[ "${skip_build}" = "true" ]]; then

     echo "WARNING: Skipping openshift build due to OPENSHIFT_SKIP_BUILD=true"

   else

     echo "Building openshift"

@@ -5,11 +5,7 @@

 STARTTIME=$(date +%s)

 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

-oc="$(os::build::find-binary oc ${OS_ROOT})"

-if [[ -z "${oc}" ]]; then

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

-  oc="$(os::build::find-binary oc ${OS_ROOT})"

-fi

+os::util::ensure::built_binary_exists 'oc'

 function build() {

   eval "'${oc}' ex dockerbuild $2 $1 ${OS_BUILD_IMAGE_ARGS:-}"

@@ -44,11 +44,7 @@ else

   os::build::extract_tar "${OS_IMAGE_RELEASE_TAR}" "${imagedir}"

 fi

-oc="$(os::build::find-binary oc ${OS_ROOT})"

-if [[ -z "${oc}" ]]; then

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

-  oc="$(os::build::find-binary oc ${OS_ROOT})"

-fi

+os::util::ensure::built_binary_exists 'oc'

 function build() {

   eval "'${oc}' ex dockerbuild $2 $1 ${OS_BUILD_IMAGE_ARGS:-}"

@@ -1,12 +1,8 @@

 #!/bin/bash

-if ! which origin-version-change &>/dev/null; then

-  echo "The 'origin-version-change' was not found in the PATH."

-  echo "To build it, run: ./hack/build-go.sh cmd/origin-version-change"

-  echo

-  exit 1

-fi

+source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

+os::util::ensure::built_binary_exists 'origin-version-change'

 IGNORE_FILES={$IGNORE_FILES:-"examples/sample-app/github-webhook-example.json"}

 sample_files=$(find {api,examples,docs,images,plugins,test} -name "*.json" -o -name "*.yaml")

@@ -1,8 +1,5 @@

 #!/bin/bash

 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

-"${OS_ROOT}/hack/build-go.sh" tools/rebasehelpers/godepchecker

-

-# Find binary

-godepchecker="$(os::build::find-binary godepchecker)"

 $godepchecker "$@"

+os::util::ensure::built_binary_exists 'godepchecker'

@@ -38,23 +38,14 @@ function cleanup()

       os::test::junit::check_test_counters

       # use the junitreport tool to generate us a report

-      "${OS_ROOT}/hack/build-go.sh" tools/junitreport

-      junitreport="$(os::build::find-binary junitreport)"

-

-      if [[ -z "${junitreport}" ]]; then

-          echo "It looks as if you don't have a compiled junitreport binary"

-          echo

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

-          echo "'./hack/build-go.sh tools/junitreport'."

-          exit 1

-      fi

-

       cat "${JUNIT_REPORT_OUTPUT}"                             \

         | "${junitreport}" --type oscmd                        \

                            --suites nested                     \

                            --roots github.com/openshift/origin \

                            --output "${ARTIFACT_DIR}/report.xml"

       cat "${ARTIFACT_DIR}/report.xml" | "${junitreport}" summarize

+      os::util::ensure::built_binary_exists 'junitreport'

+

     fi

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

@@ -200,16 +200,7 @@ fi

 # Run 'go test' with the accumulated arguments and packages:

 if [[ -n "${junit_report}" ]]; then

     # we need to generate jUnit xml

-    "${OS_ROOT}/hack/build-go.sh" tools/junitreport

-    junitreport="$(os::build::find-binary junitreport)"

-

-    if [[ -z "${junitreport}" ]]; then

-        echo "It looks as if you don't have a compiled junitreport binary"

-        echo

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

-        echo "'./hack/build-go.sh tools/junitreport'."

-        exit 1

-    fi

+    os::util::ensure::built_binary_exists 'junitreport'

     test_output_file="${LOG_DIR}/test-go.log"

     test_error_file="${LOG_DIR}/test-go-err.log"

@@ -3,8 +3,7 @@ source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 os::build::setup_env

-hack/build-go.sh cmd/dockerregistry

-dockerregistry="$( os::build::find-binary dockerregistry )"

+os::util::ensure::built_binary_exists 'dockerregistry'

 url="${DOCKER_REGISTRY_URL:-localhost:5000}"

 # find the first builder service account token

@@ -3,20 +3,7 @@ source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 os::build::setup_env

-"${OS_ROOT}/hack/build-go.sh" vendor/k8s.io/kubernetes/cmd/libs/go2idl/client-gen

-

-# Find binary

-clientgen="$(os::build::find-binary client-gen)"

-

-if [[ ! "$clientgen" ]]; then

-  {

-    echo "It looks as if you don't have a compiled client-gen binary"

-    echo

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

-    echo "'./hack/build-go.sh vendor/k8s.io/kubernetes/cmd/libs/go2idl/client-gen'."

-  } >&2

-  exit 1

-fi

+os::util::ensure::built_binary_exists 'client-gen' 'vendor/k8s.io/kubernetes/cmd/libs/go2idl/client-gen'

 # list of package to generate client set for

 packages=(

@@ -3,15 +3,6 @@ source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 os::build::setup_env

-"${OS_ROOT}/hack/build-go.sh" tools/genconversion

-genconversion="$( os::build::find-binary genconversion )"

-

-if [[ -z "${genconversion}" ]]; then

-	echo "It looks as if you don't have a compiled genconversion binary."

-	echo

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

-	echo "'./hack/build-go.sh tools/genconversion'."

-	exit 1

-fi

+os::util::ensure::built_binary_exists 'genconversion'

 ${genconversion} --output-base="${GOPATH}/src" "$@"

\ No newline at end of file

@@ -3,15 +3,6 @@ source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 os::build::setup_env

-"${OS_ROOT}/hack/build-go.sh" tools/gendeepcopy

-gendeepcopy="$( os::build::find-binary gendeepcopy )"

-

-if [[ -z "${gendeepcopy}" ]]; then

-	echo "It looks as if you don't have a compiled gendeepcopy binary."

-	echo

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

-	echo "'./hack/build-go.sh tools/gendeepcopy'."

-	exit 1

-fi

+os::util::ensure::built_binary_exists 'gendeepcopy'

 ${gendeepcopy} --output-base="${GOPATH}/src" "$@"

\ No newline at end of file

@@ -4,31 +4,8 @@

 source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

-"${OS_ROOT}/hack/build-go.sh" tools/gendocs tools/genman

-

-# Find binary

-gendocs="$(os::build::find-binary gendocs)"

-genman="$(os::build::find-binary genman)"

-

-if [[ -z "$gendocs" ]]; then

-  {

-    echo "It looks as if you don't have a compiled gendocs binary"

-    echo

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

-    echo "'./hack/build-go.sh tools/gendocs'."

-  } >&2

-  exit 1

-fi

-

-if [[ -z "$genman" ]]; then

-  {

-    echo "It looks as if you don't have a compiled genman binary"

-    echo

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

-    echo "'./hack/build-go.sh tools/genman'"

-  } >&2

-  exit 1

-fi

+os::util::ensure::built_binary_exists 'gendocs'

+os::util::ensure::built_binary_exists 'genman'

 OUTPUT_DIR_REL=${1:-""}

 OUTPUT_DIR="${OS_ROOT}/${OUTPUT_DIR_REL}/docs/generated"

@@ -22,15 +22,7 @@ fi

 os::build::setup_env

-"${OS_ROOT}/hack/build-go.sh" tools/genprotobuf vendor/k8s.io/kubernetes/cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo

-genprotobuf="$( os::build::find-binary genprotobuf )"

-

-if [[ -z "${genprotobuf}" ]]; then

-	echo "It looks as if you don't have a compiled genprotobuf binary."

-	echo

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

-	echo "'./hack/build-go.sh tools/genprotobuf'."

-	exit 1

-fi

+os::util::ensure::built_binary_exists 'genprotobuf'

+os::util::ensure::built_binary_exists 'protoc-gen-gogo' vendor/k8s.io/kubernetes/cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo

 PATH="$( dirname "${genprotobuf}" ):${PATH}" ${genprotobuf} --output-base="${GOPATH}/src" "$@"

@@ -15,16 +15,7 @@ dryrun="${DRY_RUN:-}"

 mkdir -p /tmp/openshift/generate/swaggerdoc

-"${OS_ROOT}/hack/build-go.sh" tools/genswaggerdoc

-genswaggerdoc="$( os::build::find-binary genswaggerdoc )"

-

-if [[ -z "${genswaggerdoc}" ]]; then

-	echo "It looks as if you don't have a compiled genswaggerdoc binary."

-	echo

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

-	echo "'./hack/build-go.sh tools/genswaggerdoc'."

-	exit 1

-fi

+os::util::ensure::built_binary_exists 'genswaggerdoc'

 source_files="$( find_files | grep -E '/v1/types.go' )"

@@ -4,20 +4,7 @@ source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

 echo "===== Verifying CLI Conventions ====="

 # ensure we have the latest compiled binaries

-"${OS_ROOT}/hack/build-go.sh" tools/clicheck

-

-# Find binary

-clicheck="$(os::build::find-binary clicheck)"

-

-if [[ -z "$clicheck" ]]; then

-  {

-    echo "It looks as if you don't have a compiled clicheck binary"

-    echo

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

-    echo "'./hack/build-go.sh tools/clicheck'."

-  } >&2

-  exit 1

-fi

+os::util::ensure::built_binary_exists 'clicheck'

 if ! output=`$clicheck 2>&1`

 then

@@ -6,10 +6,8 @@ if ! git status &> /dev/null; then

   exit 0

 fi

-"${OS_ROOT}/hack/build-go.sh" tools/rebasehelpers/commitchecker

+os::util::ensure::built_binary_exists 'commitchecker'

-# Find binary

-commitchecker="$(os::build::find-binary commitchecker)"

 echo "===== Verifying UPSTREAM Commits ====="

 $commitchecker

 echo "SUCCESS: All commits are valid."

@@ -47,23 +47,14 @@ function cleanup() {

       os::test::junit::check_test_counters

       # use the junitreport tool to generate us a report

-      "${OS_ROOT}/hack/build-go.sh" tools/junitreport

-      junitreport="$(os::build::find-binary junitreport)"

-

-      if [[ -z "${junitreport}" ]]; then

-          echo "It looks as if you don't have a compiled junitreport binary"

-          echo

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

-          echo "'./hack/build-go.sh tools/junitreport'."

-          exit 1

-      fi

-

       cat "${JUNIT_REPORT_OUTPUT}" "${junit_gssapi_output}"    \

         | "${junitreport}" --type oscmd                        \

                            --suites nested                     \

                            --roots github.com/openshift/origin \

                            --output "${ARTIFACT_DIR}/report.xml"

       cat "${ARTIFACT_DIR}/report.xml" | "${junitreport}" summarize

+      os::util::ensure::built_binary_exists 'junitreport'

+

     fi

     endtime=$(date +%s); echo "$0 took $((endtime - starttime)) seconds"

@@ -212,7 +212,8 @@ function run-extended-tests() {

   if [[ -n "${dlv_debug}" ]]; then

     # run tests using delve debugger

-    local test_cmd="dlv exec ${TEST_BINARY} -- ${test_args}"

+    local extended_test; extended_test="$( os::util::find::built_binary extended.test )"

+    local test_cmd="dlv exec ${extended_test} -- ${test_args}"

   else

     # run tests normally

     local test_cmd="${TEST_BINARY} ${test_args}"

@@ -22,15 +22,11 @@ function os::test::extended::focus {

 #		be done in other contexts.

 function os::test::extended::setup () {

 	# build binaries

-	if [[ -z "$(os::build::find-binary ginkgo)" ]]; then

-		hack/build-go.sh vendor/github.com/onsi/ginkgo/ginkgo

-	fi

-	if [[ -z "$(os::build::find-binary extended.test)" ]]; then

-		hack/build-go.sh test/extended/extended.test

-	fi

-	if [[ -z "$(os::build::find-binary openshift)" ]]; then

-		hack/build-go.sh

-	fi

+	os::util::ensure::built_binary_exists 'ginkgo' 'vendor/github.com/onsi/ginkgo/ginkgo'

+	os::util::ensure::built_binary_exists 'extended.test' 'test/extended/extended.test'

+	os::util::ensure::built_binary_exists 'openshift'

+	os::util::ensure::built_binary_exists 'oadm'

+	os::util::ensure::built_binary_exists 'oc'

 	os::util::environment::setup_time_vars

 	os::util::environment::setup_all_server_vars "test-extended/core"

@@ -163,7 +159,7 @@ function os::test::extended::run () {

 		return

 	fi

-	"${GINKGO}" -v "${runArgs[@]}" "${EXTENDEDTEST}" "$@"

+	ginkgo -v "${runArgs[@]}" "$( os::util::find::built_binary extended.test )" "$@"

 }

 # Create a list of extended tests to be run with the given arguments