update pdk version

voxpupuli · Jan 14, 2020 · fd84538 · fd84538
1 parent 5568d68
commit fd84538
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 69 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 ---
+dist: xenial
 language: ruby
 cache: bundler
 before_install:
@@ -12,9 +13,6 @@ script:
 bundler_args: --without system_tests
 rvm:
   - 2.5.3
-env:
-  global:
-    - PUPPET_GEM_VERSION="~> 6.0"
 stages:
   - static
   - spec
@@ -26,89 +24,50 @@ matrix:
   fast_finish: true
   include:
     -
-      bundler_args:
+      bundler_args: --with system_tests
       dist: trusty
-      env: PLATFORMS=deb_puppet5
-      rvm: 2.5.1
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_deb]'
-      - bundle exec rake 'litmus:install_agent[puppet5]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=ubuntu1404-64 BEAKER_TESTMODE=apply
+      rvm: 2.5.3
+      script: bundle exec rake beaker
       services: docker
-      sudo: required
       stage: acceptance
-    -
-      bundler_args:
-      dist: trusty
-      env: PLATFORM=deb_puppet6
-      rvm: 2.5.1
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_deb]'
-      - bundle exec rake 'litmus:install_agent[puppet6]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
-      services: docker
       sudo: required
-      stage: acceptance
     -
-      bundler_args:
+      bundler_args: --with system_tests
       dist: trusty
-      env: PLATFORMS=el7_puppet5
-      rvm: 2.5.1
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_el7]'
-      - bundle exec rake 'litmus:install_agent[puppet5]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=ubuntu1604-64 BEAKER_TESTMODE=apply
+      rvm: 2.5.3
+      script: bundle exec rake beaker
       services: docker
-      sudo: required
       stage: acceptance
+      sudo: required
     -
-      bundler_args:
+      bundler_args: --with system_tests
       dist: trusty
-      env: PLATFORM=el7_puppet6
-      rvm: 2.5.1
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_el7]'
-      - bundle exec rake 'litmus:install_agent[puppet6]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=centos7-64 BEAKER_TESTMODE=apply
+      rvm: 2.5.3
+      script: bundle exec rake beaker
       services: docker
-      sudo: required
       stage: acceptance
+      sudo: required
     -
-      bundler_args:
+      bundler_args: --with system_tests
       dist: trusty
-      env: PLATFORMS=el6_puppet5
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=debian8-64 BEAKER_TESTMODE=apply
       rvm: 2.5.3
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_el6]'
-      - bundle exec rake 'litmus:install_agent[puppet5]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
+      script: bundle exec rake beaker
       services: docker
-      sudo: required
       stage: acceptance
+      sudo: required
     -
-      bundler_args:
+      bundler_args: --with system_tests
       dist: trusty
-      env: PLATFORMS=el6_puppet6
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=debian9-64 BEAKER_TESTMODE=apply
       rvm: 2.5.3
-      before_script:
-      - bundle exec rake 'litmus:provision_list[travis_el6]'
-      - bundle exec rake 'litmus:install_agent[puppet6]'
-      - bundle exec rake litmus:install_module
-      script:
-      - bundle exec rake litmus:acceptance:parallel
+      script: bundle exec rake beaker
       services: docker
-      sudo: required
       stage: acceptance
+      sudo: required
     -
       env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
       stage: static

diff --git a/metadata.json b/metadata.json
@@ -46,7 +46,7 @@
       "version_requirement": ">= 5.5.8 < 7.0.0"
     }
   ],
-  "pdk-version": "1.14.0",
-  "template-url": "pdk-default#1.14.0",
-  "template-ref": "1.14.0-0-g1bf3a4e"
+  "pdk-version": "1.15.0",
+  "template-url": "pdk-default#1.15.0",
+  "template-ref": "tags/1.15.0-0-g0bc522e"
 }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -55,6 +55,4 @@ def ensure_module_defined(module_name)
   end
 end
 
-at_exit { RSpec::Puppet::Coverage.report! }
-
 # 'spec_overrides' from sync.yml will appear below this line
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,4 @@ def ensure_module_defined(module_name) @@
       end
     end
-    at_exit { RSpec::Puppet::Coverage.report! }
     # 'spec_overrides' from sync.yml will appear below this line