From: Loic Dachary <ldachary@redhat.com>
Date: Mon, 2 Mar 2015 13:37:55 +0000 (+0100)
Subject: tests: keep intermediate docker build layers
X-Git-Tag: v9.0.0~220^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3842%2Fhead;p=ceph.git

tests: keep intermediate docker build layers

Because the docker devmapper backend has an intermittent bug

   https://github.com/docker/docker/issues/4036

the build of the image will sometime fail. It will eventually succeed if
the command is repeated enough times. Not removing the intermediate
layers helps speed up the operation: when repeating the command, only
the layer that failed because of the above bug is rebuilt.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/test/docker-test-helper.sh b/src/test/docker-test-helper.sh
index c2b3cdb507d..d6455248496 100755
--- a/src/test/docker-test-helper.sh
+++ b/src/test/docker-test-helper.sh
@@ -48,7 +48,7 @@ function setup_container() {
         os_version=$os_version user_id=$(id -u) \
             perl -p -e 's/%%(\w+)%%/$ENV{$1}/g' \
             dockerfile/Dockerfile.in > dockerfile/Dockerfile
-        docker $opts build --rm=true --tag=$image dockerfile
+        docker $opts build --tag=$image dockerfile
         rm -fr dockerfile
     fi
 }