Skip to content

Commit 1cbff4b

Browse files
sheenaajaysheenaajay
authored
Merge pull request puppetlabs#135 from puppetlabs/pdksync_deb10
(FM-8846) - Provision file refactored
2 parents 77d3021 + 7ddb3a7 commit 1cbff4b

File tree

3 files changed

+116
-25
lines changed

3 files changed

+116
-25
lines changed

‎.sync.yml

Lines changed: 58 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
env: PLATFORMS=deb_puppet5
1414
rvm: 2.5.1
1515
before_script:
16-
- bundle exec rake 'litmus:provision_list[waffle_deb]'
16+
- bundle exec rake 'litmus:provision_list[travis_deb]'
1717
- bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
1818
- bundle exec rake 'litmus:install_agent[puppet5]'
1919
- bundle exec rake litmus:install_module
@@ -26,7 +26,7 @@
2626
env: PLATFORMS=deb_puppet6
2727
rvm: 2.5.1
2828
before_script:
29-
- bundle exec rake 'litmus:provision_list[waffle_deb]'
29+
- bundle exec rake 'litmus:provision_list[travis_deb]'
3030
- bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
3131
- bundle exec rake 'litmus:install_agent[puppet6]'
3232
- bundle exec rake litmus:install_module
@@ -35,23 +35,73 @@
3535
services: docker
3636
sudo: required
3737
stage: acceptance
38-
- bundler_args:
39-
env: PLATFORMS=el_puppet5
38+
- bundler_args:
39+
env: PLATFORMS=ub_puppet5
4040
rvm: 2.5.1
4141
before_script:
42-
- bundle exec rake 'litmus:provision_list[waffle_el]'
42+
- bundle exec rake 'litmus:provision_list[travis_ub]'
43+
- bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
4344
- bundle exec rake 'litmus:install_agent[puppet5]'
4445
- bundle exec rake litmus:install_module
4546
script:
4647
- bundle exec rake litmus:acceptance:serial
4748
services: docker
4849
sudo: required
4950
stage: acceptance
50-
- bundler_args:
51-
env: PLATFORMS=el_puppet6
51+
- bundler_args:
52+
env: PLATFORMS=ub_puppet6
53+
rvm: 2.5.1
54+
before_script:
55+
- bundle exec rake 'litmus:provision_list[travis_ub]'
56+
- bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
57+
- bundle exec rake 'litmus:install_agent[puppet6]'
58+
- bundle exec rake litmus:install_module
59+
script:
60+
- bundle exec rake litmus:acceptance:serial
61+
services: docker
62+
sudo: required
63+
stage: acceptance
64+
- bundler_args:
65+
env: PLATFORMS=el6_puppet5
66+
rvm: 2.5.1
67+
before_script:
68+
- bundle exec rake 'litmus:provision_list[travis_el6]'
69+
- bundle exec rake 'litmus:install_agent[puppet5]'
70+
- bundle exec rake litmus:install_module
71+
script:
72+
- bundle exec rake litmus:acceptance:serial
73+
services: docker
74+
sudo: required
75+
stage: acceptance
76+
- bundler_args:
77+
env: PLATFORMS=el6_puppet6
78+
rvm: 2.5.1
79+
before_script:
80+
- bundle exec rake 'litmus:provision_list[travis_el6]'
81+
- bundle exec rake 'litmus:install_agent[puppet6]'
82+
- bundle exec rake litmus:install_module
83+
script:
84+
- bundle exec rake litmus:acceptance:serial
85+
services: docker
86+
sudo: required
87+
stage: acceptance
88+
- bundler_args:
89+
env: PLATFORMS=el7_puppet5
90+
rvm: 2.5.1
91+
before_script:
92+
- bundle exec rake 'litmus:provision_list[travis_el7]'
93+
- bundle exec rake 'litmus:install_agent[puppet5]'
94+
- bundle exec rake litmus:install_module
95+
script:
96+
- bundle exec rake litmus:acceptance:serial
97+
services: docker
98+
sudo: required
99+
stage: acceptance
100+
- bundler_args:
101+
env: PLATFORMS=el7_puppet6
52102
rvm: 2.5.1
53103
before_script:
54-
- bundle exec rake 'litmus:provision_list[waffle_el]'
104+
- bundle exec rake 'litmus:provision_list[travis_el7]'
55105
- bundle exec rake 'litmus:install_agent[puppet6]'
56106
- bundle exec rake litmus:install_module
57107
script:

‎.travis.yml

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ matrix:
3434
rvm: 2.5.3
3535
stage: spec
3636
-
37-
before_script: ["bundle exec rake 'litmus:provision_list[waffle_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
37+
before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
3838
bundler_args:
3939
env: PLATFORMS=deb_puppet5
4040
rvm: 2.5.1
@@ -43,7 +43,7 @@ matrix:
4343
stage: acceptance
4444
sudo: required
4545
-
46-
before_script: ["bundle exec rake 'litmus:provision_list[waffle_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
46+
before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
4747
bundler_args:
4848
env: PLATFORMS=deb_puppet6
4949
rvm: 2.5.1
@@ -52,18 +52,59 @@ matrix:
5252
stage: acceptance
5353
sudo: required
5454
-
55-
before_script: ["bundle exec rake 'litmus:provision_list[waffle_el]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
55+
before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
5656
bundler_args:
57-
env: PLATFORMS=el_puppet5
57+
env: PLATFORMS=ul_puppet5
5858
rvm: 2.5.1
5959
script: ["bundle exec rake litmus:acceptance:serial"]
6060
services: docker
6161
stage: acceptance
6262
sudo: required
6363
-
64-
before_script: ["bundle exec rake 'litmus:provision_list[waffle_el]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
64+
before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
6565
bundler_args:
66-
env: PLATFORMS=el_puppet6
66+
dist: trusty
67+
env: PLATFORMS=ub_puppet6
68+
rvm: 2.5.1
69+
script: ["bundle exec rake litmus:acceptance:serial"]
70+
services: docker
71+
stage: acceptance
72+
sudo: required
73+
-
74+
before_script: ["bundle exec rake 'litmus:provision_list[travis_el6]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
75+
bundler_args:
76+
dist: trusty
77+
env: PLATFORMS=el6_puppet5
78+
rvm: 2.5.1
79+
script: ["bundle exec rake litmus:acceptance:serial"]
80+
services: docker
81+
stage: acceptance
82+
sudo: required
83+
-
84+
before_script: ["bundle exec rake 'litmus:provision_list[travis_el6]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
85+
bundler_args:
86+
dist: trusty
87+
env: PLATFORMS=el6_puppet6
88+
rvm: 2.5.1
89+
script: ["bundle exec rake litmus:acceptance:serial"]
90+
services: docker
91+
stage: acceptance
92+
sudo: required
93+
-
94+
before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
95+
bundler_args:
96+
dist: trusty
97+
env: PLATFORMS=el7_puppet5
98+
rvm: 2.5.1
99+
script: ["bundle exec rake litmus:acceptance:serial"]
100+
services: docker
101+
stage: acceptance
102+
sudo: required
103+
-
104+
before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
105+
bundler_args:
106+
dist: trusty
107+
env: PLATFORMS=el7_puppet6
67108
rvm: 2.5.1
68109
script: ["bundle exec rake litmus:acceptance:serial"]
69110
services: docker

‎provision.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
default:
33
provisioner: docker
44
images: ['waffleimage/centos7']
5+
vagrant:
6+
provisioner: vagrant
7+
images: ['centos/7', 'generic/ubuntu1804', 'gusztavvargadr/windows-server']
58
travis_deb:
6-
provisioner: docker
7-
images: ['debian:8', 'debian:9', 'ubuntu:14.04', 'ubuntu:16.04', 'ubuntu:18.04']
8-
waffle_deb:
99
provisioner: docker
10-
images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
11-
travis_el:
10+
images: ['waffleimage/debian8', 'waffleimage/debian9']
11+
travis_ub:
12+
provisioner: docker
13+
images: ['waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
14+
travis_el6:
1215
provisioner: docker
13-
images: ['centos:6', 'centos:7', 'oraclelinux:6', 'oraclelinux:7', 'scientificlinux/sl:6', 'scientificlinux/sl:7']
14-
waffle_el:
16+
images: ['waffleimage/centos6', 'waffleimage/oraclelinux6', 'waffleimage/scientificlinux6']
17+
travis_el7:
1518
provisioner: docker
16-
images: ['waffleimage/centos6', 'waffleimage/centos7', 'waffleimage/oraclelinux6', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux6', 'waffleimage/scientificlinux7']
19+
images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7']
1720
release_checks:
1821
provisioner: vmpooler
1922
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', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'win-2008r2-x86_64', 'win-2012r2-x86_64', 'win-2016-x86_64', 'win-10-pro-x86_64']
20-
vagrant:
21-
provisioner: vagrant
22-
images: ['centos/7', 'generic/ubuntu1804', 'gusztavvargadr/windows-server']

0 commit comments

Comments
 (0)