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

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

 function build() {

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

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

 }

 # Build the images

@@ -47,7 +47,7 @@ fi

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

 function build() {

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

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

 }

 # Create link to file if the FS supports hardlinks, otherwise copy the file

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

 #!/bin/bash

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

-$godepchecker "$@"

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

+godepchecker "$@"

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

       os::test::junit::check_test_counters

       # use the junitreport tool to generate us a report

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

+      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

     fi

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

@@ -212,18 +212,18 @@ if [[ -n "${junit_report}" ]]; then

     go test ${gotest_flags} ${test_packages} 2>"${test_error_file}" \

         | tee "${test_output_file}"                                 \

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

-                           --suites nested                          \

-                           --roots github.com/openshift/origin      \

-                           --stream                                 \

-                           --output "${junit_report_file}"

+        | junitreport --type gotest                                 \

+                      --suites nested                               \

+                      --roots github.com/openshift/origin           \

+                      --stream                                      \

+                      --output "${junit_report_file}"

     test_return_code="${PIPESTATUS[0]}"

     set -o pipefail

     echo

-    summary="$( "${junitreport}" summarize < "${junit_report_file}" )"

+    summary="$( junitreport summarize < "${junit_report_file}" )"

     echo "${summary}"

     if echo "${summary}" | grep -q ', 0 failed,'; then

@@ -16,4 +16,4 @@ echo

 REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY="${REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY:-/tmp/registry}" \

   DOCKER_REGISTRY_URL="${url}" \

 	KUBECONFIG=openshift.local.config/master/openshift-registry.kubeconfig \

-	${dockerregistry} images/dockerregistry/config.yml

+	dockerregistry images/dockerregistry/config.yml

@@ -23,7 +23,7 @@ function generate_clientset_for() {

   local package="$1";shift

   local name="$1";shift

   echo "-- Generating ${name} client set for ${package} ..."

-  $clientgen --clientset-path="${package}/client/clientset_generated" \

+  client-gen --clientset-path="${package}/client/clientset_generated" \

              --clientset-api-path="/oapi"                             \

              --input-base="${package}/api"                            \

              --output-base="../../.."                                 \

@@ -5,4 +5,4 @@ os::build::setup_env

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

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

\ No newline at end of file

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

\ No newline at end of file

@@ -5,4 +5,4 @@ os::build::setup_env

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

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

\ No newline at end of file

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

\ No newline at end of file

@@ -25,4 +25,4 @@ os::build::setup_env

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

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

@@ -30,7 +30,7 @@ fi

 failed='false'

 for file in ${source_files}; do

 	swagger_file="$( dirname "${file}" )/swagger_doc.go"

-	if ! ${genswaggerdoc} --input="${file}" --verify >/tmp/openshift/generate/swaggerdoc/verify.txt 2>&1; then

+	if ! genswaggerdoc --input="${file}" --verify >/tmp/openshift/generate/swaggerdoc/verify.txt 2>&1; then

 		echo "[ERROR] Errors in \"${file}\" must be addressed before Swagger documentation can be generated:"

 		cat /tmp/openshift/generate/swaggerdoc/verify.txt

 		failed='true'

@@ -45,7 +45,7 @@ for file in ${source_files}; do

 // by hack/update-generated-swagger-descriptions.sh and should be run after a full build of OpenShift.

 // ==== DO NOT EDIT THIS FILE MANUALLY ====

 " >> "${tmp_output_file}"

-		${genswaggerdoc} --input="${file}" --output="${tmp_output_file}"

+		genswaggerdoc --input="${file}" --output="${tmp_output_file}"

 		gofmt -s -w "${tmp_output_file}"

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

@@ -6,7 +6,7 @@ echo "===== Verifying CLI Conventions ====="

 # ensure we have the latest compiled binaries

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

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

+if ! output=$(clicheck 2>&1)

 then

 	echo "FAILURE: CLI is not following one or more required conventions:"

 	echo "$output"

@@ -2,7 +2,7 @@

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

 os::golang::verify_go_version

-os::golang::verify_golint_version

+os::util::ensure::system_binary_exists 'golint'

 arg="${1:-""}"

 bad_files=""

@@ -9,5 +9,5 @@ fi

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

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

-$commitchecker

+commitchecker

 echo "SUCCESS: All commits are valid."

@@ -21,8 +21,8 @@ ss=$(join '|' "${serial_exclude[@]}")

 os::log::info "Running the following tests:"

-TEST_REPORT_DIR= TEST_OUTPUT_QUIET=true ${EXTENDEDTEST} "--ginkgo.focus=${pf}" "--ginkgo.skip=${ps}" --ginkgo.dryRun --ginkgo.noColor | grep ok | grep -v skip | cut -c 20- | sort

-TEST_REPORT_DIR= TEST_OUTPUT_QUIET=true ${EXTENDEDTEST} "--ginkgo.focus=${sf}" "--ginkgo.skip=${ss}" --ginkgo.dryRun --ginkgo.noColor | grep ok | grep -v skip | cut -c 20- | sort

+TEST_REPORT_DIR= TEST_OUTPUT_QUIET=true extended.test "--ginkgo.focus=${pf}" "--ginkgo.skip=${ps}" --ginkgo.dryRun --ginkgo.noColor | grep ok | grep -v skip | cut -c 20- | sort

+TEST_REPORT_DIR= TEST_OUTPUT_QUIET=true extended.test "--ginkgo.focus=${sf}" "--ginkgo.skip=${ss}" --ginkgo.dryRun --ginkgo.noColor | grep ok | grep -v skip | cut -c 20- | sort

 echo

 exitstatus=0

@@ -30,10 +30,10 @@ exitstatus=0

 # run parallel tests

 nodes="${PARALLEL_NODES:-5}"

 os::log::info "Running parallel tests N=${nodes}"

-TEST_REPORT_FILE_NAME=conformance_parallel ${GINKGO} -v "-focus=${pf}" "-skip=${ps}" -p -nodes "${nodes}" ${EXTENDEDTEST} -- -ginkgo.v -test.timeout 6h || exitstatus=$?

+TEST_REPORT_FILE_NAME=conformance_parallel ginkgo -v "-focus=${pf}" "-skip=${ps}" -p -nodes "${nodes}" "$( os::util::find::built_binary extended.test )" -- -ginkgo.v -test.timeout 6h || exitstatus=$?

 # run tests in serial

 os::log::info "Running serial tests"

-TEST_REPORT_FILE_NAME=conformance_serial ${GINKGO} -v "-focus=${sf}" "-skip=${ss}" ${EXTENDEDTEST} -- -ginkgo.v -test.timeout 2h || exitstatus=$?

+TEST_REPORT_FILE_NAME=conformance_serial ginkgo -v "-focus=${sf}" "-skip=${ss}" "$( os::util::find::built_binary extended.test )" -- -ginkgo.v -test.timeout 2h || exitstatus=$?

 exit $exitstatus

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

       os::test::junit::check_test_counters

       # use the junitreport tool to generate us a report

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

+      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

     fi

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

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

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

   else

     # run tests normally

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

+    local test_cmd="extended.test ${test_args}"

   fi

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

@@ -268,7 +268,6 @@ else

   # cgo must be disabled to have the symbol table available

   CGO_ENABLED=0 hack/build-go.sh test/extended/extended.test

 fi

-TEST_BINARY="${OS_ROOT}/$(os::build::find-binary extended.test)"

 # enable-selinux/disable-selinux use the shared control variable

 # SELINUX_DISABLED to determine whether to re-enable selinux after it

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

 			os::log::error "No tests would be run"

 			exit 1

 		fi

-		${EXTENDEDTEST} "$@"

+		extended.test "$@"

 		exit $?

 	fi

 }

@@ -32,10 +32,6 @@ function os::test::extended::setup () {

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

 	# ensure proper relative directories are set

-	GINKGO="$(os::build::find-binary ginkgo)"

-	EXTENDEDTEST="$(os::build::find-binary extended.test)"

-	export GINKGO

-	export EXTENDEDTEST

 	export EXTENDED_TEST_PATH="${OS_ROOT}/test/extended"

 	export KUBE_REPO_ROOT="${OS_ROOT}/vendor/k8s.io/kubernetes"

@@ -175,7 +171,7 @@ function os::test::extended::test_list () {

 	while IFS= read -r; do

 		full_test_list+=( "${REPLY}" )

-	done < <(TEST_OUTPUT_QUIET=true "${EXTENDEDTEST}" "$@" --ginkgo.dryRun --ginkgo.noColor )

+	done < <(TEST_OUTPUT_QUIET=true extended.test "$@" --ginkgo.dryRun --ginkgo.noColor )

 	if [[ "{$REPLY}" ]]; then lines+=( "$REPLY" ); fi

 	for test in "${full_test_list[@]}"; do