(FM-7392) - Puppet 6 Testing Changes

diff --git a/.rubocop.yml b/.rubocop.yml
index 54d1597aaa1a34941d39d88a8bb3be165ed01e64..f5a6c2a412a28a8d7f91c6f672de9b87d3ba6ac1 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -19,6 +19,10 @@ AllCops:
 Metrics/LineLength:
   Description: People have wide screens, use them.
   Max: 200
+GetText/DecorateString:
+  Description: We don't want to decorate test output.
+  Exclude:
+  - spec/*
 RSpec/BeforeAfterAll:
   Description: Beware of using after(:all) as it may cause state to leak between tests.
     A necessary evil in acceptance testing.

diff --git a/.travis.yml b/.travis.yml
index 4208b9e7494cfe194912c9f180ac213ee452be63..e861e357f3e76aa3ce404e0d16c1c80ad1519cf1 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,26 +13,26 @@ script:
   - 'bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
-  - 2.4.4
+  - 2.5.0
 env:
   global:
-    - BEAKER_PUPPET_COLLECTION=puppet5 PUPPET_GEM_VERSION="~> 5.0"
+    - BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
 matrix:
   fast_finish: true
   include:
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
-      rvm: 2.4.4
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
+      rvm: 2.5.0
       script: bundle exec rake beaker
       services: docker
       sudo: required
     -
       bundler_args: 
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
-      rvm: 2.4.4
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
+      rvm: 2.5.0
       script: bundle exec rake beaker
       services: docker
       sudo: required
@@ -40,6 +40,9 @@ matrix:
       env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop"
     -
       env: CHECK=parallel_spec
+    -
+      env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
+      rvm: 2.4.4
     -
       env: PUPPET_GEM_VERSION="~> 4.0" CHECK=parallel_spec
       rvm: 2.1.9

diff --git a/Rakefile b/Rakefile
index 335e3f1f3c649224b8d1a4092437938cff2c83a9..204fb18cdc93921bd5fd42edf660b53e874f7ef8 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -5,7 +5,7 @@ require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_
 
 def changelog_user
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = "puppetlabs" || JSON.load(File.read('metadata.json'))['author']
+  returnVal = nil || JSON.load(File.read('metadata.json'))['author']
   raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
   puts "GitHubChangelogGenerator user:#{returnVal}"
   returnVal

diff --git a/metadata.json b/metadata.json
index 0521a0c0c0f94740188cb06c3b0e1738ba159f4b..5dc26f6fbb666bf4915ad15c352c1132553f7e8d 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -80,6 +80,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates",
-  "template-ref": "heads/master-0-g6a90b42",
+  "template-ref": "heads/master-0-g8fc95db",
   "pdk-version": "1.7.0"
 }

diff --git a/spec/default_facts.yml b/spec/default_facts.yml
index 3248be5aa694eaed8d6890ac4e19962694ce88fe..e10d991db2309d55e9b3ff432aeb50399b90fd67 100644 (file)
--- a/spec/default_facts.yml
+++ b/spec/default_facts.yml
@@ -2,7 +2,7 @@
 #
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
-concat_basedir: "/tmp"
+concat_basedir: ""
 ipaddress: "172.16.254.254"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"