X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=circle.yml;h=18e525362dd2f3503177cfb2226232ad9b5aa007;hb=7d885c87026bc44450b79f504b9a5becf0969783;hp=68679553b54bcb3e8c87cc58bda25dd390d24248;hpb=c71ff1bfb4fc8eef2b2f0ca2347de4b35e3a0197;p=github%2Ffretlink%2Fdocker-ansible.git

diff --git a/circle.yml b/circle.yml
index 6867955..18e5253 100644
--- a/circle.yml
+++ b/circle.yml
@@ -7,6 +7,7 @@ dependencies:
     - docker info
     - docker version
 
+    - docker build  -t ansible_xenial           ubuntu16.04
     - docker build  -t ansible_trusty           ubuntu14.04
     - docker build  -t ansible_precise          ubuntu12.04
     - docker build  -t ansible_jessie           debian8
@@ -15,6 +16,7 @@ dependencies:
     - docker build  -t ansible_centos6          centos6
     - docker build  -t ansible_alpine3          alpine3
 
+    - docker build  -t ansible_xenial_onbuild   ubuntu16.04-onbuild
     - docker build  -t ansible_trusty_onbuild   ubuntu14.04-onbuild
     - docker build  -t ansible_precise_onbuild  ubuntu12.04-onbuild
     - docker build  -t ansible_jessie_onbuild   debian8-onbuild
@@ -41,6 +43,7 @@ dependencies:
     - docker build  -t ansible_1.9_alpine3_onbuild  1.9-alpine3-onbuild
 
 
+    - docker build  -t ansible_master_xenial           master-ubuntu16.04
     - 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
@@ -48,6 +51,7 @@ dependencies:
     - docker build  -t ansible_master_centos7          master-centos7
     - docker build  -t ansible_master_centos6          master-centos6
 
+    - docker build  -t ansible_master_xenial_onbuild   master-ubuntu16.04-onbuild
     - 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
@@ -55,8 +59,16 @@ dependencies:
     - docker build  -t ansible_master_centos7_onbuild  master-centos7-onbuild
     - docker build  -t ansible_master_centos6_onbuild  master-centos6-onbuild
 
+
+    - docker build  -t ansible_mini_alpine3    mini-alpine3
+    - docker build  -t ansible_mini_debian8    mini-debian8
+    - docker build  -t nginx_alpine3   -f mini-test/Dockerfile.alpine3   mini-test
+    - docker build  -t nginx_debian8   -f mini-test/Dockerfile.debian8   mini-test
+
+
 test:
   override:
+    - docker run -i ansible_xenial           > result-ubuntu16.04
     - docker run -i ansible_trusty           > result-ubuntu14.04
     - docker run -i ansible_precise          > result-ubuntu12.04
     - docker run -i ansible_jessie           > result-debian8
@@ -64,6 +76,7 @@ test:
     - 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_xenial_onbuild   > result-ubuntu16.04-onbuild
     - 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
@@ -89,12 +102,14 @@ test:
     - docker run -i ansible_1.9_alpine3_onbuild  > result-1.9-alpine3-onbuild
 
 
+    - docker run -i ansible_master_xenial           > result-master-ubuntu16.04
     - 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_xenial_onbuild   > result-master-ubuntu16.04-onbuild
     - 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
@@ -103,8 +118,12 @@ test:
     - docker run -i ansible_master_centos6_onbuild  > result-master-centos6-onbuild
 
 
+    - docker run -i nginx_alpine3  2> result-nginx-alpine3
+    - docker run -i nginx_debian8  2> result-nginx-debian8
+
 
     - echo "==> Validating the test results..."
+    - sh -c "[ -s result-ubuntu16.04         ]"
     - sh -c "[ -s result-ubuntu14.04         ]"
     - sh -c "[ -s result-ubuntu12.04         ]"
     - sh -c "[ -s result-debian8             ]"
@@ -112,6 +131,7 @@ test:
     - sh -c "[ -s result-centos7             ]"
     - sh -c "[ -s result-centos6             ]"
     - sh -c "[ -s result-alpine3             ]"
+    - sh -c "[ -s result-ubuntu16.04-onbuild ]"
     - sh -c "[ -s result-ubuntu14.04-onbuild ]"
     - sh -c "[ -s result-ubuntu12.04-onbuild ]"
     - sh -c "[ -s result-debian8-onbuild     ]"
@@ -135,15 +155,20 @@ test:
     - sh -c "[ -s result-1.9-centos6-onbuild     ]"
     - sh -c "[ -s result-1.9-alpine3-onbuild     ]"
 
+    - sh -c "[ -s result-master-ubuntu16.04         ]"
     - 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-ubuntu16.04-onbuild ]"
     - 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     ]"
+
+    - sh -c "[ -s result-nginx-alpine3     ]"
+    - sh -c "[ -s result-nginx-debian8     ]"