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

 /_output

-/_tools

 /openshift.local.*

 /third-party

 /.project

@@ -5,7 +5,7 @@ go:

   - tip

 install:

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

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

   - make install-travis

 script:

@@ -32,7 +32,7 @@ os::provision::build-etcd() {

   local origin_root=$1

   local skip_build=$2

-  if [[ -f "${origin_root}/_tools/etcd/bin/etcd" &&

+  if [[ -f "${origin_root}/_output/tools/etcd/bin/etcd" &&

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

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

   # Etcd is required for integration testing which isn't a use case

@@ -12,8 +12,8 @@ os::log::stacktrace::install

 etcd_version=$(go run ${OS_ROOT}/tools/godepversion/godepversion.go ${OS_ROOT}/Godeps/Godeps.json github.com/coreos/etcd/etcdserver)

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

-cd "${OS_ROOT}/_tools"

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

+cd "${OS_ROOT}/_output/tools"

 if [ ! -d etcd ]; then

   mkdir -p etcd

@@ -130,7 +130,6 @@ function list_test_packages_under() {

         \(                                    \

               -path 'Godeps'                  \

               -o -path '*_output'             \

-              -o -path '*_tools'              \

               -o -path '*.git'                \

               -o -path '*openshift.local.*'   \

               -o -path '*Godeps/*'            \

@@ -753,7 +753,6 @@ function find_files() {

 	find . -not \( \

 		\( \

 		-wholename './_output' \

-		-o -wholename './_tools' \

 		-o -wholename './.*' \

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

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