Skip to content

Commit 7076140

Browse files
authored
Merge pull request puppetlabs#2008 from puppetlabs/pdksync_PDK_UPDATE
pdksync - (maint) - Pdk Update
2 parents 6289c79 + 460c395 commit 7076140

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

.travis.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ 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
3837
rvm: 2.5.7
3938
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -44,8 +43,7 @@ jobs:
4443
- "bundle exec rake 'litmus:provision_list[travis_ub]'"
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_ub_puppet5
5048
rvm: 2.5.7
5149
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -56,8 +54,7 @@ jobs:
5654
- "bundle exec rake 'litmus:provision_list[travis_el7]'"
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_el7_puppet5
6259
rvm: 2.5.7
6360
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -68,8 +65,7 @@ jobs:
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
7470
rvm: 2.5.7
7571
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -80,8 +76,7 @@ jobs:
8076
- "bundle exec rake 'litmus:provision_list[travis_ub]'"
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_ub_puppet6
8681
rvm: 2.5.7
8782
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -92,8 +87,7 @@ jobs:
9287
- "bundle exec rake 'litmus:provision_list[travis_el7]'"
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_el7_puppet6
9892
rvm: 2.5.7
9993
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
}
8383
],
8484
"description": "Module for Apache configuration",
85-
"pdk-version": "1.16.0",
85+
"pdk-version": "1.17.0",
8686
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
87-
"template-ref": "heads/master-0-g88c96ab"
87+
"template-ref": "1.17.0-0-gd3a4319"
8888
}

0 commit comments

Comments
 (0)