Fix: remove the need for an 'echo -e' option due to inconsistency treatments among...

[github/fretlink/docker-ansible.git] / circle.yml

diff --git a/circle.yml b/circle.yml
index 9ebe69d40c3de1c89906d4628474f41e55bed4ed..1b4821559bd7dd603b0eeb6950b8f10dd92f59d6 100644 (file)
--- a/circle.yml
+++ b/circle.yml
@@ -7,41 +7,35 @@ dependencies:
     - docker info
     - docker version
 
-    - cp ubuntu14.04/Dockerfile Dockerfile
-    - docker build  -t ansible_trusty   ubuntu14.04
+    - docker build  -t ansible_trusty           ubuntu14.04
+    - docker build  -t ansible_precise          ubuntu12.04
+    - docker build  -t ansible_jessie           debian8
+    - docker build  -t ansible_wheezy           debian7
+    - docker build  -t ansible_centos7          centos7
+    - docker build  -t ansible_centos6          centos6
+    - docker build  -t ansible_alpine3          alpine3
 
-    - cp ubuntu12.04/Dockerfile Dockerfile
-    - docker build  -t ansible_precise  ubuntu12.04
-
-    - cp debian8/Dockerfile     Dockerfile
-    - docker build  -t ansible_jessie   debian8
-
-    - cp debian7/Dockerfile     Dockerfile
-    - docker build  -t ansible_wheezy   debian7
-
-    - cp centos7/Dockerfile     Dockerfile
-    - docker build  -t ansible_centos7  centos7
-
-    - cp centos6/Dockerfile     Dockerfile
-    - docker build  -t ansible_centos6  centos6
-
-    - cp ubuntu14.04-onbuild/Dockerfile  Dockerfile
     - docker build  -t ansible_trusty_onbuild   ubuntu14.04-onbuild
-
-    - cp ubuntu12.04-onbuild/Dockerfile  Dockerfile
     - docker build  -t ansible_precise_onbuild  ubuntu12.04-onbuild
-
-    - cp debian8-onbuild/Dockerfile      Dockerfile
     - docker build  -t ansible_jessie_onbuild   debian8-onbuild
-
-    - cp debian7-onbuild/Dockerfile      Dockerfile
     - docker build  -t ansible_wheezy_onbuild   debian7-onbuild
-
-    - cp centos7-onbuild/Dockerfile      Dockerfile
     - docker build  -t ansible_centos7_onbuild  centos7-onbuild
-
-    - cp centos6-onbuild/Dockerfile      Dockerfile
     - docker build  -t ansible_centos6_onbuild  centos6-onbuild
+    - docker build  -t ansible_alpine3_onbuild  alpine3-onbuild
+
+    - docker build  -t ansible_master_trusty           master-ubuntu14.04
+    - docker build  -t ansible_master_precise          master-ubuntu12.04
+    - docker build  -t ansible_master_jessie           master-debian8
+    - docker build  -t ansible_master_wheezy           master-debian7
+    #- docker build  -t ansible_master_centos7          master-centos7
+    - docker build  -t ansible_master_centos6          master-centos6
+
+    - docker build  -t ansible_master_trusty_onbuild   master-ubuntu14.04-onbuild
+    - docker build  -t ansible_master_precise_onbuild  master-ubuntu12.04-onbuild
+    - docker build  -t ansible_master_jessie_onbuild   master-debian8-onbuild
+    - docker build  -t ansible_master_wheezy_onbuild   master-debian7-onbuild
+    #- docker build  -t ansible_master_centos7_onbuild  master-centos7-onbuild
+    - docker build  -t ansible_master_centos6_onbuild  master-centos6-onbuild
 
 test:
   override:
@@ -51,12 +45,28 @@ test:
     - 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_alpine3          > result-alpine3
     - 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
     - docker run -i ansible_wheezy_onbuild   > result-debian7-onbuild
     - docker run -i ansible_centos7_onbuild  > result-centos7-onbuild
     - docker run -i ansible_centos6_onbuild  > result-centos6-onbuild
+    - docker run -i ansible_alpine3_onbuild  > result-alpine3-onbuild
+
+    - docker run -i ansible_master_trusty           > result-master-ubuntu14.04
+    - docker run -i ansible_master_precise          > result-master-ubuntu12.04
+    - docker run -i ansible_master_jessie           > result-master-debian8
+    - docker run -i ansible_master_wheezy           > result-master-debian7
+    #- docker run -i ansible_master_centos7          > result-master-centos7
+    - docker run -i ansible_master_centos6          > result-master-centos6
+    - docker run -i ansible_master_trusty_onbuild   > result-master-ubuntu14.04-onbuild
+    - docker run -i ansible_master_precise_onbuild  > result-master-ubuntu12.04-onbuild
+    - docker run -i ansible_master_jessie_onbuild   > result-master-debian8-onbuild
+    - docker run -i ansible_master_wheezy_onbuild   > result-master-debian7-onbuild
+    #- docker run -i ansible_master_centos7_onbuild  > result-master-centos7-onbuild
+    - docker run -i ansible_master_centos6_onbuild  > result-master-centos6-onbuild
+
 
     - echo "==> Validating the test results..."
     - sh -c "[ -s result-ubuntu14.04         ]"
@@ -65,9 +75,24 @@ test:
     - sh -c "[ -s result-debian7             ]"
     - sh -c "[ -s result-centos7             ]"
     - sh -c "[ -s result-centos6             ]"
+    - sh -c "[ -s result-alpine3             ]"
     - sh -c "[ -s result-ubuntu14.04-onbuild ]"
     - sh -c "[ -s result-ubuntu12.04-onbuild ]"
     - sh -c "[ -s result-debian8-onbuild     ]"
     - sh -c "[ -s result-debian7-onbuild     ]"
     - sh -c "[ -s result-centos7-onbuild     ]"
     - sh -c "[ -s result-centos6-onbuild     ]"
+    - sh -c "[ -s result-alpine3-onbuild     ]"
+
+    - sh -c "[ -s result-master-ubuntu14.04         ]"
+    - sh -c "[ -s result-master-ubuntu12.04         ]"
+    - sh -c "[ -s result-master-debian8             ]"
+    - sh -c "[ -s result-master-debian7             ]"
+    #- sh -c "[ -s result-master-centos7             ]"
+    - sh -c "[ -s result-master-centos6             ]"
+    - sh -c "[ -s result-master-ubuntu14.04-onbuild ]"
+    - sh -c "[ -s result-master-ubuntu12.04-onbuild ]"
+    - sh -c "[ -s result-master-debian8-onbuild     ]"
+    - sh -c "[ -s result-master-debian7-onbuild     ]"
+    #- sh -c "[ -s result-master-centos7-onbuild     ]"
+    - sh -c "[ -s result-master-centos6-onbuild     ]"