Skip to content

Commit 8b2591f

Browse files
authored
pdksync - (IAC-215) - Implement use_litmus:true (#1280)
* (IAC-215) - Implement use_litmus:true * (IAC-215) - Pdk Update
1 parent d6c0a08 commit 8b2591f

File tree

3 files changed

+62
-142
lines changed

3 files changed

+62
-142
lines changed

.sync.yml

Lines changed: 8 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -14,111 +14,14 @@
1414
enabled: false
1515
branches:
1616
- release
17-
includes:
18-
- bundler_args:
19-
dist: trusty
20-
env: PLATFORMS=deb_puppet5
21-
rvm: 2.5.3
22-
before_script:
23-
- bundle exec rake 'litmus:provision_list[travis_deb]'
24-
- bundle exec rake 'litmus:install_agent[puppet5]'
25-
- bundle exec rake litmus:install_module
26-
script:
27-
- bundle exec rake litmus:acceptance:parallel
28-
services: docker
29-
sudo: required
30-
stage: acceptance
31-
- bundler_args:
32-
dist: trusty
33-
env: PLATFORM=deb_puppet6
34-
rvm: 2.5.3
35-
before_script:
36-
- bundle exec rake 'litmus:provision_list[travis_deb]'
37-
- bundle exec rake 'litmus:install_agent[puppet6]'
38-
- bundle exec rake litmus:install_module
39-
script:
40-
- bundle exec rake litmus:acceptance:parallel
41-
services: docker
42-
sudo: required
43-
stage: acceptance
44-
- bundler_args:
45-
dist: trusty
46-
env: PLATFORMS=ub_puppet5
47-
rvm: 2.5.3
48-
before_script:
49-
- bundle exec rake 'litmus:provision_list[travis_ub]'
50-
- bundle exec rake 'litmus:install_agent[puppet5]'
51-
- bundle exec rake litmus:install_module
52-
script:
53-
- bundle exec rake litmus:acceptance:parallel
54-
services: docker
55-
sudo: required
56-
stage: acceptance
57-
- bundler_args:
58-
dist: trusty
59-
env: PLATFORM=ub_puppet6
60-
rvm: 2.5.3
61-
before_script:
62-
- bundle exec rake 'litmus:provision_list[travis_ub]'
63-
- bundle exec rake 'litmus:install_agent[puppet6]'
64-
- bundle exec rake litmus:install_module
65-
script:
66-
- bundle exec rake litmus:acceptance:parallel
67-
services: docker
68-
sudo: required
69-
stage: acceptance
70-
- bundler_args:
71-
dist: trusty
72-
env: PLATFORMS=el6_puppet5
73-
rvm: 2.5.3
74-
before_script:
75-
- bundle exec rake 'litmus:provision_list[travis_el6]'
76-
- bundle exec rake 'litmus:install_agent[puppet5]'
77-
- bundle exec rake litmus:install_module
78-
script:
79-
- bundle exec rake litmus:acceptance:parallel
80-
services: docker
81-
sudo: required
82-
stage: acceptance
83-
- bundler_args:
84-
dist: trusty
85-
env: PLATFORM=el6_puppet6
86-
rvm: 2.5.3
87-
before_script:
88-
- bundle exec rake 'litmus:provision_list[travis_el6]'
89-
- bundle exec rake 'litmus:install_agent[puppet6]'
90-
- bundle exec rake litmus:install_module
91-
script:
92-
- bundle exec rake litmus:acceptance:parallel
93-
services: docker
94-
sudo: required
95-
stage: acceptance
96-
- bundler_args:
97-
dist: trusty
98-
env: PLATFORMS=el7_puppet5
99-
rvm: 2.5.3
100-
before_script:
101-
- bundle exec rake 'litmus:provision_list[travis_el7]'
102-
- bundle exec rake 'litmus:install_agent[puppet5]'
103-
- bundle exec rake litmus:install_module
104-
script:
105-
- bundle exec rake litmus:acceptance:parallel
106-
services: docker
107-
sudo: required
108-
stage: acceptance
109-
- bundler_args:
110-
dist: trusty
111-
env: PLATFORMS=el7_puppet6
112-
rvm: 2.5.3
113-
before_script:
114-
- bundle exec rake 'litmus:provision_list[travis_el7]'
115-
- bundle exec rake 'litmus:install_agent[puppet6]'
116-
- bundle exec rake litmus:install_module
117-
script:
118-
- bundle exec rake litmus:acceptance:parallel
119-
services: docker
120-
sudo: required
121-
stage: acceptance
17+
use_litmus: true
18+
litmus:
19+
provision_list:
20+
- travis_deb
21+
- travis_ub
22+
- travis_el6
23+
- travis_el7
24+
- ---travis_el
12225
simplecov: true
12326
notifications:
12427
slack:

.travis.yml

Lines changed: 53 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
os: linux
23
dist: xenial
34
language: ruby
45
cache: bundler
@@ -23,100 +24,116 @@ stages:
2324
- static
2425
- spec
2526
- acceptance
26-
matrix:
27+
jobs:
2728
fast_finish: true
2829
include:
2930
-
30-
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
31-
stage: static
32-
-
33-
env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
34-
rvm: 2.4.5
35-
stage: spec
36-
-
37-
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
38-
rvm: 2.5.3
39-
stage: spec
40-
-
41-
before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
31+
before_script:
32+
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
33+
- "bundle exec rake 'litmus:install_agent[puppet5]'"
34+
- "bundle exec rake litmus:install_module"
4235
bundler_args:
4336
dist: trusty
44-
env: PLATFORMS=deb_puppet5
37+
env: PLATFORMS=travis_deb_puppet5
4538
rvm: 2.5.3
4639
script: ["bundle exec rake litmus:acceptance:parallel"]
4740
services: docker
4841
stage: acceptance
49-
sudo: required
5042
-
51-
before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
43+
before_script:
44+
- "bundle exec rake 'litmus:provision_list[travis_ub]'"
45+
- "bundle exec rake 'litmus:install_agent[puppet5]'"
46+
- "bundle exec rake litmus:install_module"
5247
bundler_args:
5348
dist: trusty
54-
env: PLATFORM=deb_puppet6
49+
env: PLATFORMS=travis_ub_puppet5
5550
rvm: 2.5.3
5651
script: ["bundle exec rake litmus:acceptance:parallel"]
5752
services: docker
5853
stage: acceptance
59-
sudo: required
6054
-
61-
before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
55+
before_script:
56+
- "bundle exec rake 'litmus:provision_list[travis_el6]'"
57+
- "bundle exec rake 'litmus:install_agent[puppet5]'"
58+
- "bundle exec rake litmus:install_module"
6259
bundler_args:
6360
dist: trusty
64-
env: PLATFORMS=ub_puppet5
61+
env: PLATFORMS=travis_el6_puppet5
6562
rvm: 2.5.3
6663
script: ["bundle exec rake litmus:acceptance:parallel"]
6764
services: docker
6865
stage: acceptance
69-
sudo: required
7066
-
71-
before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
67+
before_script:
68+
- "bundle exec rake 'litmus:provision_list[travis_el7]'"
69+
- "bundle exec rake 'litmus:install_agent[puppet5]'"
70+
- "bundle exec rake litmus:install_module"
7271
bundler_args:
7372
dist: trusty
74-
env: PLATFORM=ub_puppet6
73+
env: PLATFORMS=travis_el7_puppet5
7574
rvm: 2.5.3
7675
script: ["bundle exec rake litmus:acceptance:parallel"]
7776
services: docker
7877
stage: acceptance
79-
sudo: required
8078
-
81-
before_script: ["bundle exec rake 'litmus:provision_list[travis_el6]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
79+
before_script:
80+
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
81+
- "bundle exec rake 'litmus:install_agent[puppet6]'"
82+
- "bundle exec rake litmus:install_module"
8283
bundler_args:
8384
dist: trusty
84-
env: PLATFORMS=el6_puppet5
85+
env: PLATFORMS=travis_deb_puppet6
8586
rvm: 2.5.3
8687
script: ["bundle exec rake litmus:acceptance:parallel"]
8788
services: docker
8889
stage: acceptance
89-
sudo: required
9090
-
91-
before_script: ["bundle exec rake 'litmus:provision_list[travis_el6]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
91+
before_script:
92+
- "bundle exec rake 'litmus:provision_list[travis_ub]'"
93+
- "bundle exec rake 'litmus:install_agent[puppet6]'"
94+
- "bundle exec rake litmus:install_module"
9295
bundler_args:
9396
dist: trusty
94-
env: PLATFORM=el6_puppet6
97+
env: PLATFORMS=travis_ub_puppet6
9598
rvm: 2.5.3
9699
script: ["bundle exec rake litmus:acceptance:parallel"]
97100
services: docker
98101
stage: acceptance
99-
sudo: required
100102
-
101-
before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
103+
before_script:
104+
- "bundle exec rake 'litmus:provision_list[travis_el6]'"
105+
- "bundle exec rake 'litmus:install_agent[puppet6]'"
106+
- "bundle exec rake litmus:install_module"
102107
bundler_args:
103108
dist: trusty
104-
env: PLATFORMS=el7_puppet5
109+
env: PLATFORMS=travis_el6_puppet6
105110
rvm: 2.5.3
106111
script: ["bundle exec rake litmus:acceptance:parallel"]
107112
services: docker
108113
stage: acceptance
109-
sudo: required
110114
-
111-
before_script: ["bundle exec rake 'litmus:provision_list[travis_el7]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
115+
before_script:
116+
- "bundle exec rake 'litmus:provision_list[travis_el7]'"
117+
- "bundle exec rake 'litmus:install_agent[puppet6]'"
118+
- "bundle exec rake litmus:install_module"
112119
bundler_args:
113120
dist: trusty
114-
env: PLATFORMS=el7_puppet6
121+
env: PLATFORMS=travis_el7_puppet6
115122
rvm: 2.5.3
116123
script: ["bundle exec rake litmus:acceptance:parallel"]
117124
services: docker
118125
stage: acceptance
119-
sudo: required
126+
-
127+
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
128+
stage: static
129+
-
130+
env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
131+
rvm: 2.4.5
132+
stage: spec
133+
-
134+
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
135+
rvm: 2.5.3
136+
stage: spec
120137
branches:
121138
only:
122139
- master

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,6 @@
8484
],
8585
"description": "MySQL module",
8686
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
87-
"template-ref": "heads/master-0-g5d52853",
87+
"template-ref": "heads/master-0-g88c96ab",
8888
"pdk-version": "1.16.0"
8989
}

0 commit comments

Comments
 (0)