(CONT-494) Fix for .sync.yml

Author: david22swan

.gitlab-ci.yml

@@ -1 +1,5 @@
 --relative
+--no-parameter_documentation-check
+--no-params_empty_string_assignment-check
+--no-file_ensure-check
+--no-variables_not_enclosed-check

.puppet-lint.rc

@@ -4,7 +4,7 @@ require:
 - rubocop-rspec
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: '2.5'
+  TargetRubyVersion: '2.4'
   Include:
   - "**/*.rb"
   Exclude:
@@ -18,6 +18,16 @@ AllCops:
   - "**/Puppetfile"
   - "**/Vagrantfile"
   - "**/Guardfile"
+  - tooling/kube_tool/*
+  - tooling/*
+  - spec/defines/*
+  - spec/classes/*
+  - spec/*
+  - spec/acceptance/*
+  - rakelib/*
+  - plans/*.pp
+  - tasks/*
+inherit_from: ".rubocop_todo.yml"
 Layout/LineLength:
   Description: People have wide screens, use them.
   Max: 200

.rubocop.yml

@@ -9,7 +9,7 @@ Gemfile:
   optional:
     ':development':
       - gem: 'github_changelog_generator'
-      version: '= 1.15.2'
+        version: '= 1.15.2'
 
 Rakefile:
   changelog_user: puppetlabs

.sync.yml

@@ -34,6 +34,7 @@ group :development do
   gem "rubocop-performance", '= 1.9.1',                require: false
   gem "rubocop-rspec", '= 2.0.1',                      require: false
   gem "rb-readline", '= 0.5.5',                        require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "github_changelog_generator", '= 1.15.2',        require: false
 end
 group :system_tests do
   gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]

.travis.yml

@@ -10,7 +10,7 @@ require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').a
 
 def changelog_user
   return unless Rake.application.top_level_tasks.include? "changelog"
-  returnVal = nil || JSON.load(File.read('metadata.json'))['author']
+  returnVal = "puppetlabs" || 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
@@ -42,13 +42,18 @@ def changelog_future_release
 end
 
 PuppetLint.configuration.send('disable_relative')
+PuppetLint.configuration.send('disable_parameter_documentation')
+PuppetLint.configuration.send('disable_params_empty_string_assignment')
+PuppetLint.configuration.send('disable_file_ensure')
+PuppetLint.configuration.send('disable_variables_not_enclosed')
 
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
     raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
     config.user = "#{changelog_user}"
     config.project = "#{changelog_project}"
+    config.since_tag = "4.0.0"
     config.future_release = "#{changelog_future_release}"
     config.exclude_labels = ['maintenance']
     config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
@@ -87,3 +92,11 @@ EOM
   end
 end
 
+require 'rspec/core/rake_task'
+namespace :kubernetes do
+  RSpec::Core::RakeTask.new(:integration) do |t|
+    t.pattern = 'spec/acceptance/**{,/*/**}/*_spec.rb'
+    t.rspec_opts = "--tag integration"
+  end
+end
+

Gemfile

@@ -68,7 +68,7 @@
       "version_requirement": ">= 6.24.0 < 8.0.0"
     }
   ],
-  "pdk-version": "2.5.0",
+  "pdk-version": "2.6.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "2.7.1-0-g9a16c87"
+  "template-ref": "heads/main-0-g434e063"
 }

Rakefile

@@ -38,6 +38,7 @@
 
 RSpec.configure do |c|
   c.default_facts = default_facts
+  c.hiera_config = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures/hiera/hiera.yaml'))
   c.before :each do
     # set to strictest setting for testing
     # by default Puppet runs at warning level
@@ -46,6 +47,7 @@
   end
   c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
   c.after(:suite) do
+    RSpec::Puppet::Coverage.report!(0)
   end
 
   # Filter backtrace noise