(maint) - Pdk Update

This commit is contained in:
David Swan
2020-02-27 13:14:56 +00:00
parent ab55fc141b
commit 76cca5c33d
2 changed files with 28 additions and 36 deletions

View File

@@ -16,7 +16,7 @@ script:
- 'SIMPLECOV=yes bundle exec rake $CHECK' - 'SIMPLECOV=yes bundle exec rake $CHECK'
bundler_args: --without system_tests bundler_args: --without system_tests
rvm: rvm:
- 2.5.3 - 2.5.7
env: env:
global: global:
- HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests" - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
@@ -32,11 +32,10 @@ jobs:
- "bundle exec rake 'litmus:provision_list[travis_deb]'" - "bundle exec rake 'litmus:provision_list[travis_deb]'"
- "bundle exec rake 'litmus:install_agent[puppet5]'" - "bundle exec rake 'litmus:install_agent[puppet5]'"
- "bundle exec rake litmus:install_module" - "bundle exec rake litmus:install_module"
bundler_args: bundler_args:
dist: trusty
env: PLATFORMS=travis_deb_puppet5 env: PLATFORMS=travis_deb_puppet5
rvm: 2.5.3 rvm: 2.5.7
script: ["bundle exec rake litmus:acceptance:parallel"] script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
services: docker services: docker
stage: acceptance stage: acceptance
- -
@@ -44,11 +43,10 @@ jobs:
- "bundle exec rake 'litmus:provision_list[travis_ub]'" - "bundle exec rake 'litmus:provision_list[travis_ub]'"
- "bundle exec rake 'litmus:install_agent[puppet5]'" - "bundle exec rake 'litmus:install_agent[puppet5]'"
- "bundle exec rake litmus:install_module" - "bundle exec rake litmus:install_module"
bundler_args: bundler_args:
dist: trusty
env: PLATFORMS=travis_ub_puppet5 env: PLATFORMS=travis_ub_puppet5
rvm: 2.5.3 rvm: 2.5.7
script: ["bundle exec rake litmus:acceptance:parallel"] script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
services: docker services: docker
stage: acceptance stage: acceptance
- -
@@ -56,11 +54,10 @@ jobs:
- "bundle exec rake 'litmus:provision_list[travis_el6]'" - "bundle exec rake 'litmus:provision_list[travis_el6]'"
- "bundle exec rake 'litmus:install_agent[puppet5]'" - "bundle exec rake 'litmus:install_agent[puppet5]'"
- "bundle exec rake litmus:install_module" - "bundle exec rake litmus:install_module"
bundler_args: bundler_args:
dist: trusty
env: PLATFORMS=travis_el6_puppet5 env: PLATFORMS=travis_el6_puppet5
rvm: 2.5.3 rvm: 2.5.7
script: ["bundle exec rake litmus:acceptance:parallel"] script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
services: docker services: docker
stage: acceptance stage: acceptance
- -
@@ -68,11 +65,10 @@ jobs:
- "bundle exec rake 'litmus:provision_list[travis_el7]'" - "bundle exec rake 'litmus:provision_list[travis_el7]'"
- "bundle exec rake 'litmus:install_agent[puppet5]'" - "bundle exec rake 'litmus:install_agent[puppet5]'"
- "bundle exec rake litmus:install_module" - "bundle exec rake litmus:install_module"
bundler_args: bundler_args:
dist: trusty
env: PLATFORMS=travis_el7_puppet5 env: PLATFORMS=travis_el7_puppet5
rvm: 2.5.3 rvm: 2.5.7
script: ["bundle exec rake litmus:acceptance:parallel"] script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
services: docker services: docker
stage: acceptance stage: acceptance
- -
@@ -80,11 +76,10 @@ jobs:
- "bundle exec rake 'litmus:provision_list[travis_deb]'" - "bundle exec rake 'litmus:provision_list[travis_deb]'"
- "bundle exec rake 'litmus:install_agent[puppet6]'" - "bundle exec rake 'litmus:install_agent[puppet6]'"
- "bundle exec rake litmus:install_module" - "bundle exec rake litmus:install_module"
bundler_args: bundler_args:
dist: trusty
env: PLATFORMS=travis_deb_puppet6 env: PLATFORMS=travis_deb_puppet6
rvm: 2.5.3 rvm: 2.5.7
script: ["bundle exec rake litmus:acceptance:parallel"] script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
services: docker services: docker
stage: acceptance stage: acceptance
- -
@@ -92,11 +87,10 @@ jobs:
- "bundle exec rake 'litmus:provision_list[travis_ub]'" - "bundle exec rake 'litmus:provision_list[travis_ub]'"
- "bundle exec rake 'litmus:install_agent[puppet6]'" - "bundle exec rake 'litmus:install_agent[puppet6]'"
- "bundle exec rake litmus:install_module" - "bundle exec rake litmus:install_module"
bundler_args: bundler_args:
dist: trusty
env: PLATFORMS=travis_ub_puppet6 env: PLATFORMS=travis_ub_puppet6
rvm: 2.5.3 rvm: 2.5.7
script: ["bundle exec rake litmus:acceptance:parallel"] script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
services: docker services: docker
stage: acceptance stage: acceptance
- -
@@ -104,11 +98,10 @@ jobs:
- "bundle exec rake 'litmus:provision_list[travis_el6]'" - "bundle exec rake 'litmus:provision_list[travis_el6]'"
- "bundle exec rake 'litmus:install_agent[puppet6]'" - "bundle exec rake 'litmus:install_agent[puppet6]'"
- "bundle exec rake litmus:install_module" - "bundle exec rake litmus:install_module"
bundler_args: bundler_args:
dist: trusty
env: PLATFORMS=travis_el6_puppet6 env: PLATFORMS=travis_el6_puppet6
rvm: 2.5.3 rvm: 2.5.7
script: ["bundle exec rake litmus:acceptance:parallel"] script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
services: docker services: docker
stage: acceptance stage: acceptance
- -
@@ -116,11 +109,10 @@ jobs:
- "bundle exec rake 'litmus:provision_list[travis_el7]'" - "bundle exec rake 'litmus:provision_list[travis_el7]'"
- "bundle exec rake 'litmus:install_agent[puppet6]'" - "bundle exec rake 'litmus:install_agent[puppet6]'"
- "bundle exec rake litmus:install_module" - "bundle exec rake litmus:install_module"
bundler_args: bundler_args:
dist: trusty
env: PLATFORMS=travis_el7_puppet6 env: PLATFORMS=travis_el7_puppet6
rvm: 2.5.3 rvm: 2.5.7
script: ["bundle exec rake litmus:acceptance:parallel"] script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
services: docker services: docker
stage: acceptance stage: acceptance
- -
@@ -132,7 +124,7 @@ jobs:
stage: spec stage: spec
- -
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
rvm: 2.5.3 rvm: 2.5.7
stage: spec stage: spec
branches: branches:
only: only:

View File

@@ -81,6 +81,6 @@
} }
], ],
"template-url": "https://github.com/puppetlabs/pdk-templates#master", "template-url": "https://github.com/puppetlabs/pdk-templates#master",
"template-ref": "heads/master-0-g88c96ab", "template-ref": "1.17.0-0-gd3a4319",
"pdk-version": "1.16.0" "pdk-version": "1.17.0"
} }