Skip to content

Commit ef1ffa8

Browse files
author
David Swan
committed
(IAC-215) - Pdk Update
1 parent 26a65c0 commit ef1ffa8

File tree

2 files changed

+55
-38
lines changed

2 files changed

+55
-38
lines changed

‎.travis.yml‎

Lines changed: 54 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
os: linux
23
dist: trusty
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: PLATFORMS=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: PLATFORMS=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: PLATFORMS=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
@@ -128,7 +145,7 @@ notifications:
128145
secure: j5y9T97u6QlDPs4eEnDNch2IGAzbfWycVcMutP3u9Klvkgqu33xtxHgyAQOW+2A/Xw2sKQs/LzIiUeQRzlNMcAPRZ0rK19sW1w5OgZGcd131HViFDfX8W7V4R41sZVNF232JekMr7RwPGIaZ9htaGsDJeJF8TaiG1Akk32LQZV8=
129146
deploy:
130147
provider: puppetforge
131-
user: puppet
148+
username: puppet
132149
password:
133150
secure: ""
134151
on:

‎metadata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,5 @@
107107
"description": "Standard Library for Puppet Modules",
108108
"pdk-version": "1.16.0",
109109
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
110-
"template-ref": "heads/master-0-g5d52853"
110+
"template-ref": "heads/master-0-g88c96ab"
111111
}

0 commit comments

Comments
 (0)