Skip to content

Commit 91a0f21

Browse files
author
David Swan
committed
(FM-8581) - Debian 10 added to travis and provision file refactored
1 parent 7f7c840 commit 91a0f21

File tree

3 files changed

+60
-14
lines changed

3 files changed

+60
-14
lines changed

.sync.yml

+26
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,32 @@
3939
services: docker
4040
sudo: required
4141
stage: acceptance
42+
- bundler_args:
43+
dist: trusty
44+
env: PLATFORMS=ub_puppet5
45+
rvm: 2.5.3
46+
before_script:
47+
- bundle exec rake 'litmus:provision_list[travis_ub]'
48+
- bundle exec rake 'litmus:install_agent[puppet5]'
49+
- bundle exec rake litmus:install_module
50+
script:
51+
- bundle exec rake litmus:acceptance:parallel
52+
services: docker
53+
sudo: required
54+
stage: acceptance
55+
- bundler_args:
56+
dist: trusty
57+
env: PLATFORM=ub_puppet6
58+
rvm: 2.5.3
59+
before_script:
60+
- bundle exec rake 'litmus:provision_list[travis_ub]'
61+
- bundle exec rake 'litmus:install_agent[puppet6]'
62+
- bundle exec rake litmus:install_module
63+
script:
64+
- bundle exec rake litmus:acceptance:parallel
65+
services: docker
66+
sudo: required
67+
stage: acceptance
4268
- bundler_args:
4369
dist: trusty
4470
env: PLATFORMS=el7_puppet5

.travis.yml

+25-5
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@ matrix:
5454
stage: acceptance
5555
sudo: required
5656
-
57-
before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
57+
before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
5858
bundler_args:
5959
dist: trusty
60-
env: PLATFORMS=el7_puppet5
60+
env: PLATFORMS=ub_puppet5
6161
rvm: 2.5.3
6262
script: ["bundle exec rake litmus:acceptance:parallel"]
6363
services: docker
6464
stage: acceptance
6565
sudo: required
6666
-
67-
before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
67+
before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
6868
bundler_args:
6969
dist: trusty
70-
env: PLATFORM=el7_puppet6
70+
env: PLATFORM=ub_puppet6
7171
rvm: 2.5.3
7272
script: ["bundle exec rake litmus:acceptance:parallel"]
7373
services: docker
@@ -87,7 +87,27 @@ matrix:
8787
before_script: ["bundle exec rake 'litmus:provision_list[travis_el6]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
8888
bundler_args:
8989
dist: trusty
90-
env: PLATFORMS=el6_puppet6
90+
env: PLATFORM=el6_puppet6
91+
rvm: 2.5.3
92+
script: ["bundle exec rake litmus:acceptance:parallel"]
93+
services: docker
94+
stage: acceptance
95+
sudo: required
96+
-
97+
before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
98+
bundler_args:
99+
dist: trusty
100+
env: PLATFORMS=el7_puppet5
101+
rvm: 2.5.3
102+
script: ["bundle exec rake litmus:acceptance:parallel"]
103+
services: docker
104+
stage: acceptance
105+
sudo: required
106+
-
107+
before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
108+
bundler_args:
109+
dist: trusty
110+
env: PLATFORM=el7_puppet6
91111
rvm: 2.5.3
92112
script: ["bundle exec rake litmus:acceptance:parallel"]
93113
services: docker

provision.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
default:
33
provisioner: docker_exp
44
images: ['waffleimage/centos7']
5+
vagrant:
6+
provisioner: vagrant
7+
images: ['centos/7', 'generic/ubuntu1804']
58
travis_deb:
69
provisioner: docker
7-
images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
10+
images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/debian10']
11+
travis_ub:
12+
provisioner: docker
13+
images: ['waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
814
travis_el6:
915
provisioner: docker_exp
1016
images: ['waffleimage/centos6', 'waffleimage/scientificlinux6']
11-
travis_el7:
17+
travis_el77:
1218
provisioner: docker_exp
13-
images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7']
14-
travis_el8:
15-
provisioner: docker_exp
16-
images: ['litmusimage/centos:8']
17-
vagrant:
18-
provisioner: vagrant
19-
images: ['centos/7', 'generic/ubuntu1804']
19+
images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
2020
release_checks:
2121
provisioner: vmpooler
2222
images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'oracle-5-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'sles-11-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']

0 commit comments

Comments
 (0)