Revert "Update to go 1.7.4"

Nino Kodabande · Nino Kodabande · commit af830ed7f5bc · 2016-12-09T15:24:16.000-08:00
[#135813681] This reverts commit 46f4c77.
diff --git a/jobs/acceptance_tests/spec b/jobs/acceptance_tests/spec
@@ -6,7 +6,7 @@ templates:
   config.json.erb: bin/config.json
 
 packages:
- - golang1.7
+ - golang1.6
  - acceptance_tests
  - tcp_emitter
  - rtr
diff --git a/jobs/acceptance_tests/templates/run.erb b/jobs/acceptance_tests/templates/run.erb
@@ -2,7 +2,7 @@
 
 set -e -x
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.7)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.6)
 export PATH=${GOROOT}/bin:${PATH}
 
 export GOPATH=/var/vcap/packages/acceptance_tests
diff --git a/packages/acceptance_tests/packaging b/packages/acceptance_tests/packaging
@@ -1,6 +1,6 @@
 set -e -x
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.7)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.6)
 export PATH=${GOROOT}/bin:${PATH}
 
 export GOPATH=$BOSH_INSTALL_TARGET
diff --git a/packages/acceptance_tests/spec b/packages/acceptance_tests/spec
@@ -2,7 +2,7 @@
 name: acceptance_tests
 
 dependencies:
-  - golang1.7
+  - golang1.6
   - rtr
 
 files:
diff --git a/packages/golang1.6/packaging b/packages/golang1.6/packaging
@@ -0,0 +1,4 @@
+set -e
+
+tar xzf golang/go1.6.3.linux-amd64.tar.gz
+cp -R go/* ${BOSH_INSTALL_TARGET}
diff --git a/packages/golang1.6/spec b/packages/golang1.6/spec
@@ -0,0 +1,5 @@
+---
+name: golang1.6
+
+files:
+  - golang/go1.6.3.linux-amd64.tar.gz
diff --git a/packages/golang1.7/packaging b/packages/golang1.7/packaging
diff --git a/packages/golang1.7/spec b/packages/golang1.7/spec
diff --git a/packages/gorouter/packaging b/packages/gorouter/packaging
@@ -1,6 +1,6 @@
 set -e -x
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.7)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.6)
 export PATH=$GOROOT/bin:$PATH
 
 mkdir -p ${BOSH_INSTALL_TARGET}/src
diff --git a/packages/gorouter/spec b/packages/gorouter/spec
@@ -1,7 +1,7 @@
 ---
 name: gorouter
 dependencies:
-- golang1.7
+- golang1.6
 files:
   - routing-release/src/code.cloudfoundry.org/gorouter/**/*.{go,golden,proto,c,h,}
   - routing-release/src/code.cloudfoundry.org/gorouter/LICENSE
diff --git a/packages/route_registrar/packaging b/packages/route_registrar/packaging
@@ -1,6 +1,6 @@
 set -e -x
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.7)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.6)
 export PATH=$GOROOT/bin:$PATH
 
 mkdir -p ${BOSH_INSTALL_TARGET}/src
diff --git a/packages/route_registrar/spec b/packages/route_registrar/spec
@@ -1,7 +1,7 @@
 ---
 name: route_registrar
 dependencies:
-- golang1.7
+- golang1.6
 files:
   - routing-release/src/code.cloudfoundry.org/cflager/*.go # gosub
   - routing-release/src/code.cloudfoundry.org/lager/*.go # gosub
diff --git a/packages/routing-api/packaging b/packages/routing-api/packaging
@@ -4,7 +4,7 @@ mkdir -p ${BOSH_INSTALL_TARGET}/src
 cp -a . ${BOSH_INSTALL_TARGET}/src
 export GOPATH=$BOSH_INSTALL_TARGET
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.7)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.6)
 export PATH=$GOROOT/bin:$PATH
 go install code.cloudfoundry.org/routing-api/cmd/routing-api
 
diff --git a/packages/routing-api/spec b/packages/routing-api/spec
@@ -2,7 +2,7 @@
 name: routing-api
 
 dependencies:
-  - golang1.7
+  - golang1.6
 
 files:
   - code.cloudfoundry.org/cf-tcp-router/utils/*.go # gosub
diff --git a/packages/tcp_emitter/packaging b/packages/tcp_emitter/packaging
@@ -4,7 +4,7 @@ mkdir -p ${BOSH_INSTALL_TARGET}/src
 cp -a . ${BOSH_INSTALL_TARGET}/src
 export GOPATH=$BOSH_INSTALL_TARGET
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.7)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.6)
 export PATH=$GOROOT/bin:$PATH
 go install code.cloudfoundry.org/tcp-emitter/cmd/tcp-emitter
 
diff --git a/packages/tcp_emitter/spec b/packages/tcp_emitter/spec
@@ -2,7 +2,7 @@
 name: tcp_emitter
 
 dependencies:
-  - golang1.7
+  - golang1.6
 
 files:
   - code.cloudfoundry.org/bbs/*.go # gosub
diff --git a/packages/tcp_router/packaging b/packages/tcp_router/packaging
@@ -4,7 +4,7 @@ mkdir -p ${BOSH_INSTALL_TARGET}/src
 cp -a . ${BOSH_INSTALL_TARGET}/src
 export GOPATH=$BOSH_INSTALL_TARGET
 
-export GOROOT=$(readlink -nf /var/vcap/packages/golang1.7)
+export GOROOT=$(readlink -nf /var/vcap/packages/golang1.6)
 export PATH=$GOROOT/bin:$PATH
 go install code.cloudfoundry.org/cf-tcp-router
 
diff --git a/packages/tcp_router/spec b/packages/tcp_router/spec
@@ -2,7 +2,7 @@
 name: tcp_router
 
 dependencies:
-  - golang1.7
+  - golang1.6
 
 files:
   - code.cloudfoundry.org/cf-tcp-router/*.go # gosub
diff --git a/src/code.cloudfoundry.org/routing-api b/src/code.cloudfoundry.org/routing-api
@@ -1 +1 @@
-Subproject commit 5d6a0120838041c996d0013a94f04480978bd9b6
+Subproject commit 2005008d56d709fb3aa460df4a221a4a22e0da53
diff --git a/src/code.cloudfoundry.org/tcp-emitter b/src/code.cloudfoundry.org/tcp-emitter
@@ -1 +1 @@
-Subproject commit 536ea14da58934883cb80141b686962c66eeb837
+Subproject commit b57b298ef5799bd103b2c5b1bff69602a196d0f4

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +set -e
++
 +tar xzf golang/go1.6.3.linux-amd64.tar.gz
 +cp -R go/* ${BOSH_INSTALL_TARGET}