From 3243e3d41a9d80380cabbbc0ccc0bf0f1df6e2be Mon Sep 17 00:00:00 2001 From: David Chung Date: Thu, 5 Jan 2017 16:10:35 -0800 Subject: [PATCH 1/3] Fix broken build due to CircleCI's outdated Docker version Signed-off-by: David Chung --- scripts/container-test | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/container-test b/scripts/container-test index b614b135b..baa1a8f47 100755 --- a/scripts/container-test +++ b/scripts/container-test @@ -13,6 +13,7 @@ DOCKER_TAG="${DOCKER_TAG:-dev}" cleanup() { docker ps | grep devbundle | awk '{print $1}' | xargs docker stop + docker ps | grep devbundle | awk '{print $1}' | xargs docker rm rm -rf $TEST_DIR } trap cleanup EXIT @@ -27,7 +28,7 @@ volumes="-v $TEST_DIR:/root -v $PWD/docs:/root/docs" envs="-e INFRAKIT_PLUGINS_DIR=/root" server() { - docker run -d --rm --name $1 $envs $volumes $DOCKER_IMAGE:$DOCKER_TAG $@ + docker run -d --name $1 $envs $volumes $DOCKER_IMAGE:$DOCKER_TAG $@ } run() { From 656c29a34361750f746605f2330be691bee3ada4 Mon Sep 17 00:00:00 2001 From: David Chung Date: Thu, 5 Jan 2017 16:20:33 -0800 Subject: [PATCH 2/3] Fix build timeout on CircleCI Signed-off-by: David Chung --- scripts/container-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/container-test b/scripts/container-test index baa1a8f47..736343066 100755 --- a/scripts/container-test +++ b/scripts/container-test @@ -107,7 +107,7 @@ expect_output_lines "10 instances should exist in group" "run infrakit group des # Terminate 3 instances. pushd $TEST_DIR/tutorial - rm $(ls | head -3) + rm -f $(ls | head -3) popd sleep 5 From f64648dcc2b3ffbc885f53aa8a1fa31abcb6561f Mon Sep 17 00:00:00 2001 From: David Chung Date: Thu, 5 Jan 2017 16:39:24 -0800 Subject: [PATCH 3/3] fix broken circle ci build Signed-off-by: David Chung --- circle.yml | 1 + scripts/container-test | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index b75466336..3fd0153b6 100644 --- a/circle.yml +++ b/circle.yml @@ -9,6 +9,7 @@ machine: GOVERSION: "1.7" GOPATH: "$HOME/.go_workspace" WORKDIR: "$GOPATH/src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME" + DOCKER_RM: "false" dependencies: pre: diff --git a/scripts/container-test b/scripts/container-test index 736343066..8a3abe08d 100755 --- a/scripts/container-test +++ b/scripts/container-test @@ -10,10 +10,14 @@ cd "$HERE/.." TEST_DIR=$(pwd)/container-test DOCKER_IMAGE="${DOCKER_IMAGE:-infrakit/devbundle}" DOCKER_TAG="${DOCKER_TAG:-dev}" +DOCKER_RM="${DOCKER_RM:-true}" cleanup() { - docker ps | grep devbundle | awk '{print $1}' | xargs docker stop - docker ps | grep devbundle | awk '{print $1}' | xargs docker rm + if [ "$DOCKER_RM" = "true" ]; then + echo "cleaning up docker images" + docker ps | grep devbundle | awk '{print $1}' | xargs docker stop + docker ps | grep devbundle | awk '{print $1}' | xargs docker rm + fi rm -rf $TEST_DIR } trap cleanup EXIT