diff --git a/.travis.yml b/.travis.yml index cdb8a7a..d74e515 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,19 +4,14 @@ env: # CentOS 7. - container_id: $(mktemp) distribution: centos - version: "7" + version: 7 init: /usr/lib/systemd/systemd run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro" - # Ubuntu 12.04. - # - container_id: $(mktemp) - # distribution: ubuntu - # version: precise - # init: /sbin/init - # run_opts: "" + # Ubuntu 14.04. - container_id: $(mktemp) distribution: ubuntu - version: trusty + version: 14.04 init: /sbin/init run_opts: "" @@ -28,11 +23,11 @@ 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" + - "sudo docker build --rm=true --file=tests/Dockerfile.${distribution} --tag=${distribution}:ansible tests" script: # Run container in detached state. - - 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}${version}:ansible "${init}" > "${container_id}"' + - sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}:ansible "${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'