Fix: CircleCI

diff --git a/circle.yml b/circle.yml
index 6779d9d86cb73fd711350b7c6df909019b11c263..9ebe69d40c3de1c89906d4628474f41e55bed4ed 100644 (file)
--- a/circle.yml
+++ b/circle.yml
@@ -7,50 +7,50 @@ dependencies:
     - docker info
     - docker version
 
-    - cp test/Dockerfile-ubuntu14.04 Dockerfile
-    - docker build  -t ansible_trusty   .
+    - cp ubuntu14.04/Dockerfile Dockerfile
+    - docker build  -t ansible_trusty   ubuntu14.04
 
-    - cp test/Dockerfile-ubuntu12.04 Dockerfile
-    - docker build  -t ansible_precise  .
+    - cp ubuntu12.04/Dockerfile Dockerfile
+    - docker build  -t ansible_precise  ubuntu12.04
 
-    - cp test/Dockerfile-debian8 Dockerfile
-    - docker build  -t ansible_jessie   .
+    - cp debian8/Dockerfile     Dockerfile
+    - docker build  -t ansible_jessie   debian8
 
-    - cp test/Dockerfile-debian7 Dockerfile
-    - docker build  -t ansible_wheezy   .
+    - cp debian7/Dockerfile     Dockerfile
+    - docker build  -t ansible_wheezy   debian7
 
-    - cp test/Dockerfile-centos7 Dockerfile
-    - docker build  -t ansible_centos7  .
+    - cp centos7/Dockerfile     Dockerfile
+    - docker build  -t ansible_centos7  centos7
 
-    - cp test/Dockerfile-centos6 Dockerfile
-    - docker build  -t ansible_centos6  .
+    - cp centos6/Dockerfile     Dockerfile
+    - docker build  -t ansible_centos6  centos6
 
-    - cp test/Dockerfile-ubuntu14.04-onbuild Dockerfile
-    - docker build  -t ansible_trusty_onbuild   .
+    - cp ubuntu14.04-onbuild/Dockerfile  Dockerfile
+    - docker build  -t ansible_trusty_onbuild   ubuntu14.04-onbuild
 
-    - cp test/Dockerfile-ubuntu12.04-onbuild Dockerfile
-    - docker build  -t ansible_precise_onbuild  .
+    - cp ubuntu12.04-onbuild/Dockerfile  Dockerfile
+    - docker build  -t ansible_precise_onbuild  ubuntu12.04-onbuild
 
-    - cp test/Dockerfile-debian8-onbuild Dockerfile
-    - docker build  -t ansible_jessie_onbuild   .
+    - cp debian8-onbuild/Dockerfile      Dockerfile
+    - docker build  -t ansible_jessie_onbuild   debian8-onbuild
 
-    - cp test/Dockerfile-debian7-onbuild Dockerfile
-    - docker build  -t ansible_wheezy_onbuild   .
+    - cp debian7-onbuild/Dockerfile      Dockerfile
+    - docker build  -t ansible_wheezy_onbuild   debian7-onbuild
 
-    - cp test/Dockerfile-centos7-onbuild Dockerfile
-    - docker build  -t ansible_centos7_onbuild  .
+    - cp centos7-onbuild/Dockerfile      Dockerfile
+    - docker build  -t ansible_centos7_onbuild  centos7-onbuild
 
-    - cp test/Dockerfile-centos6-onbuild Dockerfile
-    - docker build  -t ansible_centos6_onbuild  .
+    - cp centos6-onbuild/Dockerfile      Dockerfile
+    - docker build  -t ansible_centos6_onbuild  centos6-onbuild
 
 test:
   override:
-    - docker run -i ansible_trusty   > result-ubuntu14.04
-    - docker run -i ansible_precise  > result-ubuntu12.04
-    - docker run -i ansible_jessie   > result-debian8
-    - docker run -i ansible_wheezy   > result-debian7
-    - docker run -i ansible_centos7  > result-centos7
-    - docker run -i ansible_centos6  > result-centos6
+    - docker run -i ansible_trusty           > result-ubuntu14.04
+    - docker run -i ansible_precise          > result-ubuntu12.04
+    - docker run -i ansible_jessie           > result-debian8
+    - docker run -i ansible_wheezy           > result-debian7
+    - docker run -i ansible_centos7          > result-centos7
+    - docker run -i ansible_centos6          > result-centos6
     - docker run -i ansible_trusty_onbuild   > result-ubuntu14.04-onbuild
     - docker run -i ansible_precise_onbuild  > result-ubuntu12.04-onbuild
     - docker run -i ansible_jessie_onbuild   > result-debian8-onbuild
@@ -59,12 +59,12 @@ test:
     - docker run -i ansible_centos6_onbuild  > result-centos6-onbuild
 
     - echo "==> Validating the test results..."
-    - sh -c "[ -s result-ubuntu14.04 ]"
-    - sh -c "[ -s result-ubuntu12.04 ]"
-    - sh -c "[ -s result-debian8     ]"
-    - sh -c "[ -s result-debian7     ]"
-    - sh -c "[ -s result-centos7     ]"
-    - sh -c "[ -s result-centos6     ]"
+    - sh -c "[ -s result-ubuntu14.04         ]"
+    - sh -c "[ -s result-ubuntu12.04         ]"
+    - sh -c "[ -s result-debian8             ]"
+    - sh -c "[ -s result-debian7             ]"
+    - sh -c "[ -s result-centos7             ]"
+    - sh -c "[ -s result-centos6             ]"
     - sh -c "[ -s result-ubuntu14.04-onbuild ]"
     - sh -c "[ -s result-ubuntu12.04-onbuild ]"
     - sh -c "[ -s result-debian8-onbuild     ]"