From 5335c133a3f8a7648e7720f20d6526e3ffcbc51c Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 25 Oct 2016 14:34:43 +0100 Subject: [PATCH 1/4] Update deprecated gcloud syntax --- test/gce.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/gce.sh b/test/gce.sh index cb3e56b7..e3a64634 100755 --- a/test/gce.sh +++ b/test/gce.sh @@ -34,7 +34,7 @@ function vm_names { # Delete all vms in this account function destroy { names="$(vm_names)" - if [ $(gcloud compute instances list --zone $ZONE -q $names | wc -l) -le 1 ] ; then + if [ $(gcloud compute instances list --zones $ZONE -q $names | wc -l) -le 1 ] ; then return 0 fi for i in {0..10}; do From dfadb8f189c6c501c4763333e681d6689287f006 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 25 Oct 2016 14:35:33 +0100 Subject: [PATCH 2/4] Upgrade to Ubuntu 16.04 and Docker 1.11 Using Docker 1.11 since there isn't a Docker-supplied package for 1.10 on Xenial --- test/gce.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/gce.sh b/test/gce.sh index e3a64634..2c6ce13e 100755 --- a/test/gce.sh +++ b/test/gce.sh @@ -10,8 +10,9 @@ set -e : ${KEY_FILE:=/tmp/gce_private_key.json} : ${SSH_KEY_FILE:=$HOME/.ssh/gce_ssh_key} : ${PROJECT:=positive-cocoa-90213} -: ${IMAGE:=ubuntu-14-04} -: ${TEMPLATE_NAME:=test-template-10} +: ${IMAGE_FAMILY:=ubuntu-1604-lts} +: ${IMAGE_PROJECT:=ubuntu-os-cloud} +: ${TEMPLATE_NAME:=test-template-11} : ${ZONE:=us-central1-a} : ${NUM_HOSTS:=5} SUFFIX="" @@ -72,7 +73,7 @@ function install_docker_on { name=$1 ssh -t $name sudo bash -x -s < Date: Tue, 25 Oct 2016 16:05:07 +0100 Subject: [PATCH 3/4] Pre-install more stuff in the image. Install bc and jq in the image rather than on every build. Also pre-pull some Docker images --- bin/circle-dependencies-post | 3 --- test/gce.sh | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/circle-dependencies-post b/bin/circle-dependencies-post index 866f0b9a..2a8e86aa 100755 --- a/bin/circle-dependencies-post +++ b/bin/circle-dependencies-post @@ -2,9 +2,6 @@ set -e -# We need jq to analyse the PR files JSON, so install that first -sudo apt-get -q update && sudo apt-get -q install bc jq - echo "TEST_AND_PUBLISH=1" > "$STATE" if [ -n "$CI_PULL_REQUEST" -a "$CI_PULL_REQUEST" = "$CI_PULL_REQUESTS" ] ; then diff --git a/test/gce.sh b/test/gce.sh index 2c6ce13e..ed3f9530 100755 --- a/test/gce.sh +++ b/test/gce.sh @@ -76,13 +76,18 @@ curl -sSL https://get.docker.com/gpg | sudo apt-key add - curl -sSL https://get.docker.com/ | sed -e s/docker-engine/docker-engine=1.11.2-0~xenial/ | sh apt-get update -qq; apt-get install -q -y --force-yes --no-install-recommends ethtool; +apt-get install -q -y bc jq; usermod -a -G docker vagrant; echo 'DOCKER_OPTS="-H unix:///var/run/docker.sock -H unix:///var/run/alt-docker.sock -H tcp://0.0.0.0:2375 -s overlay"' >> /etc/default/docker; service docker restart EOF # It seems we need a short delay for docker to start up, so I put this in # a separate ssh connection. This installs nsenter. - ssh -t $name sudo docker run --rm -v /usr/local/bin:/target jpetazzo/nsenter + ssh -t $name sudo bash -x -s < Date: Wed, 26 Oct 2016 14:02:36 +0100 Subject: [PATCH 4/4] Reconfigure and restart docker for systemctl --- test/gce.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/test/gce.sh b/test/gce.sh index ed3f9530..22ebc9de 100755 --- a/test/gce.sh +++ b/test/gce.sh @@ -78,12 +78,15 @@ apt-get update -qq; apt-get install -q -y --force-yes --no-install-recommends ethtool; apt-get install -q -y bc jq; usermod -a -G docker vagrant; -echo 'DOCKER_OPTS="-H unix:///var/run/docker.sock -H unix:///var/run/alt-docker.sock -H tcp://0.0.0.0:2375 -s overlay"' >> /etc/default/docker; -service docker restart -EOF - # It seems we need a short delay for docker to start up, so I put this in - # a separate ssh connection. This installs nsenter. - ssh -t $name sudo bash -x -s </etc/systemd/system/docker.service.d/override.conf <