Revert go 1.9 downgrade

Aidan Obley · christianang · commit 993222594cda · 2018-05-17T09:49:19.000-07:00
This reverts commit e30d381 and 9a7fda9. [#157636189] Signed-off-by: Christian Ang <cang@pivotal.io>
diff --git a/.final_builds/packages/golang-1.10-linux/index.yml b/.final_builds/packages/golang-1.10-linux/index.yml
@@ -0,0 +1,6 @@
+builds:
+  48c842421b6f05acf88dc6ec17f7574dade28a86:
+    version: 48c842421b6f05acf88dc6ec17f7574dade28a86
+    blobstore_id: f5658891-de64-4fe7-5e8f-d342ba0ec43b
+    sha1: e9a18aebf2c407ce17423c22c913b6612cf4b75f
+format-version: "2"
diff --git a/.final_builds/packages/golang-1.9-linux/index.yml b/.final_builds/packages/golang-1.9-linux/index.yml
diff --git a/ci/pipelines/images.yml b/ci/pipelines/images.yml
@@ -116,7 +116,7 @@ resources:
   source:
     endpoint: storage.googleapis.com
     bucket: golang
-    regexp: 'go(1\.9(\.\d+)?)\.linux-amd64\.tar.gz'
+    regexp: 'go(1\.\d+(\.\d+)?)\.linux-amd64\.tar.gz'
 
 - name: cf-networking-release-ci
   type: git
diff --git a/jobs/performance-test-sd/spec b/jobs/performance-test-sd/spec
@@ -6,7 +6,7 @@ templates:
   config.json.erb: config.json
 
 packages:
-  - golang-1.9-linux
+  - golang-1.10-linux
   - performance-test-sd
 
 consumes:
diff --git a/jobs/performance-test-sd/templates/run-tests.erb b/jobs/performance-test-sd/templates/run-tests.erb
@@ -5,7 +5,7 @@ set -o pipefail
 
 
 pushd /var/vcap/packages/performance-test-sd > /dev/null
-  source /var/vcap/packages/golang-1.9-linux/bosh/compile.env
+  source /var/vcap/packages/golang-1.10-linux/bosh/compile.env
 popd > /dev/null
 
 DATA_DIR=/var/vcap/data/performance-test-sd
diff --git a/packages/bosh-dns-adapter/packaging b/packages/bosh-dns-adapter/packaging
@@ -1,7 +1,7 @@
 set -e
 
 pushd ${BOSH_INSTALL_TARGET} > /dev/null
-  source /var/vcap/packages/golang-1.9-linux/bosh/compile.env
+  source /var/vcap/packages/golang-1.10-linux/bosh/compile.env
 popd > /dev/null
 
 mkdir -p ${BOSH_INSTALL_TARGET}/src
diff --git a/packages/bosh-dns-adapter/spec b/packages/bosh-dns-adapter/spec
@@ -2,7 +2,7 @@
 name: bosh-dns-adapter
 
 dependencies:
-  - golang-1.9-linux
+  - golang-1.10-linux
 
 files:
   - bosh-dns-adapter/*.go # gosub
diff --git a/packages/golang-1.10-linux/spec.lock b/packages/golang-1.10-linux/spec.lock
@@ -0,0 +1,2 @@
+name: golang-1.10-linux
+fingerprint: 48c842421b6f05acf88dc6ec17f7574dade28a86
diff --git a/packages/golang-1.9-linux/spec.lock b/packages/golang-1.9-linux/spec.lock
diff --git a/packages/packages/golang-1.9-linux/packaging b/packages/packages/golang-1.9-linux/packaging
diff --git a/packages/packages/golang-1.9-linux/spec b/packages/packages/golang-1.9-linux/spec
diff --git a/packages/policy-server/packaging b/packages/policy-server/packaging
@@ -4,7 +4,7 @@ set -eu
 mkdir ../src && cp -a * ../src/ && mv ../src ./src
 mkdir -p $BOSH_INSTALL_TARGET/bin
 
-source /var/vcap/packages/golang-1.9-linux/bosh/compile.env
+source /var/vcap/packages/golang-1.10-linux/bosh/compile.env
 
 go build -o "${BOSH_INSTALL_TARGET}/bin/policy-server" policy-server/cmd/policy-server
 go build -o "${BOSH_INSTALL_TARGET}/bin/policy-server-internal" policy-server/cmd/policy-server-internal
diff --git a/packages/policy-server/spec b/packages/policy-server/spec
@@ -2,7 +2,7 @@
 name: policy-server
 
 dependencies:
-  - golang-1.9-linux
+  - golang-1.10-linux
 
 files:
   - code.cloudfoundry.org/cf-networking-helpers/db/*.go # gosub
diff --git a/packages/route_populator/packaging b/packages/route_populator/packaging
@@ -2,7 +2,7 @@
 set -e -x
 
 pushd ${BOSH_INSTALL_TARGET} > /dev/null
-  source /var/vcap/packages/golang-1.9-linux/bosh/compile.env
+  source /var/vcap/packages/golang-1.10-linux/bosh/compile.env
 popd > /dev/null
 
 mkdir -p ${BOSH_INSTALL_TARGET}/src
diff --git a/packages/route_populator/spec b/packages/route_populator/spec
@@ -2,7 +2,7 @@
 name: route_populator
 
 dependencies:
-  - golang-1.9-linux
+  - golang-1.10-linux
 
 files:
   - route_populator/*.go # gosub
diff --git a/packages/runc-cni/packaging b/packages/runc-cni/packaging
@@ -4,7 +4,7 @@ set -eu
 mkdir ../src && cp -a * ../src/ && mv ../src ./src
 mkdir -p ${BOSH_INSTALL_TARGET}/bin
 
-source /var/vcap/packages/golang-1.9-linux/bosh/compile.env
+source /var/vcap/packages/golang-1.10-linux/bosh/compile.env
 
 go build -o "${BOSH_INSTALL_TARGET}/bin/garden-external-networker" garden-external-networker
 
diff --git a/packages/runc-cni/spec b/packages/runc-cni/spec
@@ -2,7 +2,7 @@
 name: runc-cni
 
 dependencies:
-  - golang-1.9-linux
+  - golang-1.10-linux
 
 files:
   - github.com/containernetworking/cni/scripts/*
diff --git a/packages/service-discovery-controller/packaging b/packages/service-discovery-controller/packaging
@@ -1,7 +1,7 @@
 set -e -x
 
 pushd ${BOSH_INSTALL_TARGET} > /dev/null
-  source /var/vcap/packages/golang-1.9-linux/bosh/compile.env
+  source /var/vcap/packages/golang-1.10-linux/bosh/compile.env
 popd > /dev/null
 
 mkdir -p ${BOSH_INSTALL_TARGET}/src
diff --git a/packages/service-discovery-controller/spec b/packages/service-discovery-controller/spec
@@ -2,7 +2,7 @@
 name: service-discovery-controller
 
 dependencies:
-  - golang-1.9-linux
+  - golang-1.10-linux
 
 files:
   - code.cloudfoundry.org/cf-networking-helpers/lagerlevel/*.go # gosub

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+name: golang-1.10-linux`
	`2`	`+fingerprint: 48c842421b6f05acf88dc6ec17f7574dade28a86`