summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorJeff Geerling <geerlingguy@mac.com>2016-09-13 22:41:16 -0500
committerJeff Geerling <geerlingguy@mac.com>2016-09-13 22:41:16 -0500
commit64de2a4bcbb0b8273ba66ab5c82c7b9db5c10740 (patch)
treeef01a0b0ac381a90800927e716fb6144ee908dcf /.travis.yml
parentaae107a28cea42016a49a735ade8817cb5b9ce2c (diff)
downloadntp-64de2a4bcbb0b8273ba66ab5c82c7b9db5c10740.tar.gz
ntp-64de2a4bcbb0b8273ba66ab5c82c7b9db5c10740.tar.bz2
ntp-64de2a4bcbb0b8273ba66ab5c82c7b9db5c10740.tar.xz
ntp-64de2a4bcbb0b8273ba66ab5c82c7b9db5c10740.zip
More efficient Docker test layout.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml30
1 files changed, 14 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml
index 668ba3b..33dc0c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,20 +2,19 @@
sudo: required
env:
- - distribution: centos
- version: 6
+ - distro: centos7
+ init: /usr/lib/systemd/systemd
+ run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+ - distro: centos6
init: /sbin/init
run_opts: ""
- - distribution: centos
- version: 7
- init: /usr/lib/systemd/systemd
+ - distro: ubuntu1604
+ init: /lib/systemd/systemd
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
- - distribution: ubuntu
- version: 14.04
+ - distro: ubuntu1404
init: /sbin/init
run_opts: ""
- - distribution: ubuntu
- version: 12.04
+ - distro: ubuntu1204
init: /sbin/init
run_opts: ""
@@ -23,15 +22,13 @@ services:
- docker
before_install:
- # Pull container
- - 'sudo docker pull ${distribution}:${version}'
- # Customize container
- - 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+ # Pull container.
+ - 'sudo docker pull geerlingguy/docker-${distro}-ansible:latest'
script:
- container_id=$(mktemp)
- # Run container in detached state
- - 'sudo docker run --detach -p 8025:8025 --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
+ # Run container in detached state.
+ - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} geerlingguy/docker-${distro}-ansible:latest "${init}" > "${container_id}"'
# Ansible syntax check.
- 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/test.yml --syntax-check'
@@ -48,7 +45,8 @@ script:
&& (echo 'Idempotence test: pass' && exit 0)
|| (echo 'Idempotence test: fail' && exit 1)
- # Clean up
+after_success:
+ # Clean up.
- 'sudo docker stop "$(cat ${container_id})"'
notifications: