Merge pull request #1272 from puppetlabs/pdksync_travis-updates

pdksync - (maint) travis updates: bundler and slack

Author: lionce

.sync.yml

@@ -92,6 +92,9 @@
     sudo: required
     stage: acceptance
   simplecov: true
+  notifications:
+    slack:
+      secure: XpBD602OXRZHSTDylzzx/OqpfThEJPbx0PLhXctWuES4GpW1EHWnyPgrliNOaJOh0Zb7qMrdaKWLOltfqPT5IanPd0XF7GbT8RrNeLTmLXqvHmC6dDqWxnvFvdSrGwqpj7s7Dbwl79nmszONRj1OlolPmJgY/2kGw88c71biaas=
 appveyor.yml:
   delete: true
 Gemfile:

.travis.yml

@@ -5,7 +5,9 @@ cache: bundler
 before_install:
   - bundle -v
   - rm -f Gemfile.lock
-  - gem update --system $RUBYGEMS_VERSION
+  - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
+  - "# See https://github.com/puppetlabs/pdk-templates/commit/705154d5c437796b821691b707156e1b056d244f for an example of how this was used"
+  - '[ -z "$RUBYGEMS_VERSION" ] || gem update --system $RUBYGEMS_VERSION'
   - gem --version
   - bundle -v
 script:
@@ -71,27 +73,6 @@ matrix:
       services: docker
       stage: acceptance
       sudo: required
-    # FM-8784: Back out CentOS 8, Puppet 6 tests until image provisioning issue can be resolved
-    # -
-    #   before_script: ["bundle exec rake 'litmus:provision_list[travis_el8]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
-    #   bundler_args: 
-    #   dist: trusty
-    #   env: PLATFORMS=el8_puppet5
-    #   rvm: 2.5.3
-    #   script: ["bundle exec rake litmus:acceptance:parallel"]
-    #   services: docker
-    #   stage: acceptance
-    #   sudo: required
-    # -
-    #   before_script: ["bundle exec rake 'litmus:provision_list[travis_el8]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
-    #   bundler_args: 
-    #   dist: trusty
-    #   env: PLATFORM=el8_puppet6
-    #   rvm: 2.5.3
-    #   script: ["bundle exec rake litmus:acceptance:parallel"]
-    #   services: docker
-    #   stage: acceptance
-    #   sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_el6]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
@@ -119,3 +100,5 @@ branches:
     - release
 notifications:
   email: false
+  slack:
+    secure: XpBD602OXRZHSTDylzzx/OqpfThEJPbx0PLhXctWuES4GpW1EHWnyPgrliNOaJOh0Zb7qMrdaKWLOltfqPT5IanPd0XF7GbT8RrNeLTmLXqvHmC6dDqWxnvFvdSrGwqpj7s7Dbwl79nmszONRj1OlolPmJgY/2kGw88c71biaas=

metadata.json

@@ -84,6 +84,6 @@
   ],
   "description": "MySQL module",
   "template-url": "https://github.com/puppetlabs/pdk-templates#master",
-  "template-ref": "heads/master-0-g643529a",
-  "pdk-version": "1.14.1"
+  "template-ref": "heads/master-0-gcaed9d7",
+  "pdk-version": "1.15.0"
 }