Bump garden-ci-ubuntu image to 0.10.0

* Also stop using concourse/bin-ci for build-gdn-linux and switch to garden-ci-ubuntu instead. This gives us control over the versions of static-assets (e.g. iptables, tar, etc) that gdn gets built with. * These versions should exactly match the versions used in our BOSH packages to make sure we're consistently testing the same thing. [#150545872] Signed-off-by: Tom Godkin <[email protected]>
cloudfoundry · Aug 30, 2017 · eed31c8 · eed31c8
1 parent 531f501
commit eed31c8
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 21 deletions.
diff --git a/ci/bucketbench.yml b/ci/bucketbench.yml
@@ -3,7 +3,7 @@ image_resource:
   type: docker-image
   source:
       repository: cfgarden/garden-ci-ubuntu
-      tag: '0.9.5'
+      tag: '0.10.0'
 
 platform: linux
 

diff --git a/ci/build-gdn-linux.yml b/ci/build-gdn-linux.yml
@@ -3,7 +3,9 @@ platform: linux
 
 image_resource:
   type: docker-image
-  source: {repository: concourse/bin-ci}
+  source:
+    repository: cfgarden/garden-ci-ubuntu
+    tag: '0.10.0'
 
 inputs:
 - name: gr-release-develop

diff --git a/ci/cfbench.yml b/ci/cfbench.yml
@@ -2,8 +2,8 @@
 image_resource:
   type: docker-image
   source:
-      repository: cfgarden/garden-ci-ubuntu
-      tag: '0.9.5'
+    repository: cfgarden/garden-ci-ubuntu
+    tag: '0.10.0'
 
 platform: linux
 

diff --git a/ci/garden.yml b/ci/garden.yml
@@ -2,8 +2,8 @@
 image_resource:
   type: docker-image
   source:
-      repository: cfgarden/garden-ci-ubuntu
-      tag: '0.9.5'
+    repository: cfgarden/garden-ci-ubuntu
+    tag: '0.10.0'
 
 platform: linux
 

diff --git a/ci/gats-gdn-linux.yml b/ci/gats-gdn-linux.yml
@@ -2,8 +2,8 @@
 image_resource:
   type: docker-image
   source:
-      repository: cfgarden/garden-ci-ubuntu
-      tag: '0.9.5'
+    repository: cfgarden/garden-ci-ubuntu
+    tag: '0.10.0'
 
 platform: linux
 

diff --git a/ci/gats.yml b/ci/gats.yml
@@ -2,8 +2,8 @@
 image_resource:
   type: docker-image
   source:
-      repository: cfgarden/garden-ci-ubuntu
-      tag: '0.9.5'
+    repository: cfgarden/garden-ci-ubuntu
+    tag: '0.10.0'
 
 platform: linux
 

diff --git a/ci/guardian.yml b/ci/guardian.yml
@@ -2,8 +2,8 @@
 image_resource:
   type: docker-image
   source:
-      repository: cfgarden/garden-ci-ubuntu
-      tag: '0.9.5'
+    repository: cfgarden/garden-ci-ubuntu
+    tag: '0.10.0'
 
 platform: linux
 

diff --git a/ci/nested-shed-tests.yml b/ci/nested-shed-tests.yml
@@ -2,8 +2,8 @@
 image_resource:
   type: docker-image
   source:
-      repository: cfgarden/garden-ci-ubuntu
-      tag: '0.9.5'
+    repository: cfgarden/garden-ci-ubuntu
+    tag: '0.10.0'
 
 platform: linux
 

diff --git a/ci/non-nested-gats.yml b/ci/non-nested-gats.yml
@@ -2,8 +2,8 @@
 image_resource:
   type: docker-image
   source:
-      repository: cfgarden/golang-ci
-      tag: '0.2.1'
+    repository: cfgarden/golang-ci
+    tag: '0.2.1'
 
 platform: linux
 

diff --git a/ci/performance-tests.yml b/ci/performance-tests.yml
@@ -2,8 +2,8 @@
 image_resource:
   type: docker-image
   source:
-      repository: cfgarden/golang-ci
-      tag: '0.2.1'
+    repository: cfgarden/golang-ci
+    tag: '0.2.1'
 
 platform: linux
 

diff --git a/ci/scripts/build-gdn-linux b/ci/scripts/build-gdn-linux
@@ -16,7 +16,7 @@ LINUX_ASSETS=$PWD/linux
 rm -rf $LINUX_ASSETS
 mkdir -p $LINUX_ASSETS/{bin,sbin}
 
-cp /opt/static-assets/tar $LINUX_ASSETS/bin/tar
+cp /opt/static-assets/tar/bin/tar $LINUX_ASSETS/bin/tar
 
 # go-bindata does weird stuff with symlinks. we only care about iptables anyway
 cp -aL /opt/static-assets/iptables/sbin/iptables $LINUX_ASSETS/sbin/iptables

diff --git a/ci/scripts/gats b/ci/scripts/gats
@@ -46,7 +46,9 @@ $GOPATH/bin/gdn \
   --init-bin=$GOPATH/bin/init \
   --dadoo-bin=$GOPATH/bin/dadoo \
   --nstar-bin=./rundmc/nstar/nstar \
-  --tar-bin=/opt/tar \
+  --tar-bin=/opt/static-assets/tar/bin/tar \
+  --iptables-bin=/opt/static-assets/iptables/sbin/iptables \
+  --iptables-restore-bin=/opt/static-assets/iptables/sbin/iptables-restore \
   --depot=$tmpdir/depot \
   --graph=$tmpdir/graph \
   --bind-ip=0.0.0.0 \

diff --git a/ci/scripts/guardian b/ci/scripts/guardian
@@ -32,7 +32,7 @@ export GARDEN_TEST_ROOTFS=/opt/warden/rootfs
 export GARDEN_PREEXISTING_USERS_TEST_ROOTFS=/opt/warden/preexisting-users-rootfs
 export GARDEN_FUSE_TEST_ROOTFS=/opt/warden/fuse-rootfs
 export GARDEN_NESTABLE_TEST_ROOTFS=/opt/warden/nestable-rootfs
-export GARDEN_TAR_PATH=/opt/tar
+export GARDEN_TAR_PATH=/opt/static-assets/tar/bin/tar
 export GARDEN_TEST_GRAPHPATH=/tmp/aufs_mount
 export GARDEN_DORA_PATH=$PWD/../garden-integration-tests/resources/dora.tgz
 [ -d /opt/warden/docker-registry-v2-rootfs ] && export GARDEN_DOCKER_REGISTRY_V2_TEST_ROOTFS=/opt/warden/docker-registry-v2-rootfs