Skip to content

Commit 0461f0c

Browse files
committed
Use better Travis file syntax for global var.
1 parent 7215915 commit 0461f0c

File tree

1 file changed

+28
-29
lines changed

1 file changed

+28
-29
lines changed

.travis.yml

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,35 @@
22
sudo: required
33

44
env:
5-
- repository: geerlingguy/docker-centos6-ansible
6-
version: latest
7-
init: /sbin/init
8-
run_opts: ""
9-
playbook: test.yml
5+
global:
6+
# https://github.com/travis-ci/travis-ci/issues/6461#issuecomment-239577306
107
DOCKER_VERSION: "1.9.1-0~trusty"
11-
- repository: geerlingguy/docker-centos7-ansible
12-
version: latest
13-
init: /usr/lib/systemd/systemd
14-
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
15-
playbook: centos-7-test.yml
16-
DOCKER_VERSION: "1.9.1-0~trusty"
17-
- repository: geerlingguy/docker-ubuntu1604-ansible
18-
version: latest
19-
init: /lib/systemd/systemd
20-
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
21-
playbook: test.yml
22-
DOCKER_VERSION: "1.9.1-0~trusty"
23-
- repository: geerlingguy/docker-ubuntu1404-ansible
24-
version: latest
25-
init: /sbin/init
26-
run_opts: ""
27-
playbook: test.yml
28-
DOCKER_VERSION: "1.9.1-0~trusty"
29-
# - repository: geerlingguy/docker-ubuntu1204-ansible
30-
# version: latest
31-
# init: /sbin/init
32-
# run_opts: ""
33-
# playbook: test.yml
34-
# DOCKER_VERSION: "1.9.1-0~trusty"
8+
matrix:
9+
- repository: geerlingguy/docker-centos6-ansible
10+
version: latest
11+
init: /sbin/init
12+
run_opts: ""
13+
playbook: test.yml
14+
- repository: geerlingguy/docker-centos7-ansible
15+
version: latest
16+
init: /usr/lib/systemd/systemd
17+
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
18+
playbook: centos-7-test.yml
19+
- repository: geerlingguy/docker-ubuntu1604-ansible
20+
version: latest
21+
init: /lib/systemd/systemd
22+
run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
23+
playbook: test.yml
24+
- repository: geerlingguy/docker-ubuntu1404-ansible
25+
version: latest
26+
init: /sbin/init
27+
run_opts: ""
28+
playbook: test.yml
29+
# - repository: geerlingguy/docker-ubuntu1204-ansible
30+
# version: latest
31+
# init: /sbin/init
32+
# run_opts: ""
33+
# playbook: test.yml
3534

3635
services:
3736
- docker

0 commit comments

Comments
 (0)