Skip to content

Commit 75203bd

Browse files
committed
Test using Docker registry images instead of baked-in Dockerfiles.
1 parent 154faaa commit 75203bd

File tree

7 files changed

+12
-164
lines changed

7 files changed

+12
-164
lines changed

.travis.yml

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22
sudo: required
33

44
env:
5-
- distribution: centos
6-
version: 6
5+
- repository: geerlingguy/docker-centos6-ansible
6+
version: latest
77
init: /sbin/init
88
run_opts: ""
99
playbook: test.yml
1010
DOCKER_VERSION: "1.9.1-0~trusty"
11-
- distribution: centos
12-
version: 7
11+
- repository: geerlingguy/docker-centos7-ansible
12+
version: latest
1313
init: /usr/lib/systemd/systemd
1414
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
1515
playbook: centos-7-test.yml
1616
DOCKER_VERSION: "1.9.1-0~trusty"
17-
- distribution: ubuntu
18-
version: 16.04
17+
- repository: geerlingguy/docker-ubuntu1604-ansible
18+
version: latest
1919
init: /lib/systemd/systemd
2020
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
2121
playbook: test.yml
2222
DOCKER_VERSION: "1.9.1-0~trusty"
23-
- distribution: ubuntu
24-
version: 14.04
23+
- repository: geerlingguy/docker-ubuntu1404-ansible
24+
version: latest
2525
init: /sbin/init
2626
run_opts: ""
2727
playbook: test.yml
2828
DOCKER_VERSION: "1.9.1-0~trusty"
29-
# - distribution: ubuntu
30-
# version: 12.04
29+
# - repository: geerlingguy/docker-ubuntu1204-ansible
30+
# version: latest
3131
# init: /sbin/init
3232
# run_opts: ""
3333
# playbook: test.yml
@@ -43,14 +43,12 @@ before_install:
4343
- sudo apt-get install docker-engine=$DOCKER_VERSION -yq --no-install-suggests --no-install-recommends --force-yes -o Dpkg::Options::="--force-confnew"
4444

4545
# Pull container
46-
- 'sudo docker pull ${distribution}:${version}'
47-
# Customize container
48-
- 'sudo docker build --rm=true --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
46+
- 'sudo docker pull ${repository}:${version}'
4947

5048
script:
5149
- container_id=$(mktemp)
5250
# Run container in detached state
53-
- 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${distribution}-${version}:ansible "${init}" > "${container_id}"'
51+
- 'sudo docker run --detach --volume="${PWD}":/etc/ansible/roles/role_under_test:ro ${run_opts} ${repository}:${version} "${init}" > "${container_id}"'
5452

5553
# Ansible syntax check.
5654
- 'sudo docker exec --tty "$(cat ${container_id})" env TERM=xterm ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --syntax-check'

tests/Dockerfile.centos-6

Lines changed: 0 additions & 19 deletions
This file was deleted.

tests/Dockerfile.centos-7

Lines changed: 0 additions & 31 deletions
This file was deleted.

tests/Dockerfile.ubuntu-12.04

Lines changed: 0 additions & 24 deletions
This file was deleted.

tests/Dockerfile.ubuntu-14.04

Lines changed: 0 additions & 25 deletions
This file was deleted.

tests/Dockerfile.ubuntu-16.04

Lines changed: 0 additions & 28 deletions
This file was deleted.

tests/initctl_faker

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)