Skip to content

Commit 68e31b3

Browse files
author
David Swan
committed
(maint) - Pdk Update
1 parent 83f5d82 commit 68e31b3

File tree

2 files changed

+22
-28
lines changed

2 files changed

+22
-28
lines changed

.travis.yml

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ script:
1616
- 'SIMPLECOV=yes bundle exec rake $CHECK'
1717
bundler_args: --without system_tests
1818
rvm:
19-
- 2.5.3
19+
- 2.5.7
2020
env:
2121
global:
2222
- HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
@@ -32,71 +32,65 @@ jobs:
3232
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
3333
- "bundle exec rake 'litmus:install_agent[puppet5]'"
3434
- "bundle exec rake litmus:install_module"
35-
bundler_args:
36-
dist: trusty
35+
bundler_args:
3736
env: PLATFORMS=travis_deb_puppet5
38-
rvm: 2.5.3
39-
script: ["bundle exec rake litmus:acceptance:parallel"]
37+
rvm: 2.5.7
38+
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
4039
services: docker
4140
stage: acceptance
4241
-
4342
before_script:
4443
- "bundle exec rake 'litmus:provision_list[travis_el]'"
4544
- "bundle exec rake 'litmus:install_agent[puppet5]'"
4645
- "bundle exec rake litmus:install_module"
47-
bundler_args:
48-
dist: trusty
46+
bundler_args:
4947
env: PLATFORMS=travis_el_puppet5
50-
rvm: 2.5.3
51-
script: ["bundle exec rake litmus:acceptance:parallel"]
48+
rvm: 2.5.7
49+
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
5250
services: docker
5351
stage: acceptance
5452
-
5553
before_script:
5654
- "bundle exec rake 'litmus:provision_list[travis_ub]'"
5755
- "bundle exec rake 'litmus:install_agent[puppet5]'"
5856
- "bundle exec rake litmus:install_module"
59-
bundler_args:
60-
dist: trusty
57+
bundler_args:
6158
env: PLATFORMS=travis_ub_puppet5
62-
rvm: 2.5.3
63-
script: ["bundle exec rake litmus:acceptance:parallel"]
59+
rvm: 2.5.7
60+
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
6461
services: docker
6562
stage: acceptance
6663
-
6764
before_script:
6865
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
6966
- "bundle exec rake 'litmus:install_agent[puppet6]'"
7067
- "bundle exec rake litmus:install_module"
71-
bundler_args:
72-
dist: trusty
68+
bundler_args:
7369
env: PLATFORMS=travis_deb_puppet6
74-
rvm: 2.5.3
75-
script: ["bundle exec rake litmus:acceptance:parallel"]
70+
rvm: 2.5.7
71+
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
7672
services: docker
7773
stage: acceptance
7874
-
7975
before_script:
8076
- "bundle exec rake 'litmus:provision_list[travis_el]'"
8177
- "bundle exec rake 'litmus:install_agent[puppet6]'"
8278
- "bundle exec rake litmus:install_module"
83-
bundler_args:
84-
dist: trusty
79+
bundler_args:
8580
env: PLATFORMS=travis_el_puppet6
86-
rvm: 2.5.3
87-
script: ["bundle exec rake litmus:acceptance:parallel"]
81+
rvm: 2.5.7
82+
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
8883
services: docker
8984
stage: acceptance
9085
-
9186
before_script:
9287
- "bundle exec rake 'litmus:provision_list[travis_ub]'"
9388
- "bundle exec rake 'litmus:install_agent[puppet6]'"
9489
- "bundle exec rake litmus:install_module"
95-
bundler_args:
96-
dist: trusty
90+
bundler_args:
9791
env: PLATFORMS=travis_ub_puppet6
98-
rvm: 2.5.3
99-
script: ["bundle exec rake litmus:acceptance:parallel"]
92+
rvm: 2.5.7
93+
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
10094
services: docker
10195
stage: acceptance
10296
-
@@ -108,7 +102,7 @@ jobs:
108102
stage: spec
109103
-
110104
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
111-
rvm: 2.5.3
105+
rvm: 2.5.7
112106
stage: spec
113107
-
114108
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"version_requirement": ">= 5.5.0 < 7.0.0"
7878
}
7979
],
80-
"pdk-version": "1.16.0",
80+
"pdk-version": "1.17.0",
8181
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
82-
"template-ref": "heads/master-0-g88c96ab"
82+
"template-ref": "1.17.0-0-gd3a4319"
8383
}

0 commit comments

Comments
 (0)