(CONT-494) Fix for .sync.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644 (file)
index 6d5e786..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,53 +0,0 @@
----
-stages:
-  - syntax
-  - unit
-
-default:
-  cache:
-    paths:
-      - vendor/bundle
-
-  before_script: &before_script
-    - bundle -v
-    - rm Gemfile.lock || true
-    - "# Update system gems if requested. This is useful to temporarily workaround troubles in the test runner"
-    - "# Set `rubygems_version` in the .sync.yml to set a value"
-    - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
-    - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
-    - gem --version
-    - bundle -v
-    - bundle install --without system_tests --path vendor/bundle --jobs $(nproc)
-
-validate lint check rubocop-Ruby 2.5.7-Puppet ~> 6:
-  stage: syntax
-  image: ruby:2.5.7
-  script:
-    - bundle exec rake validate lint check rubocop
-  variables:
-    PUPPET_GEM_VERSION: '~> 6'
-
-parallel_spec-Ruby 2.5.7-Puppet ~> 6:
-  stage: unit
-  image: ruby:2.5.7
-  script:
-    - bundle exec rake parallel_spec
-  variables:
-    PUPPET_GEM_VERSION: '~> 6'
-
-validate lint check rubocop-Ruby 2.7.2-Puppet ~> 7:
-  stage: syntax
-  image: ruby:2.7.2
-  script:
-    - bundle exec rake validate lint check rubocop
-  variables:
-    PUPPET_GEM_VERSION: '~> 7'
-
-parallel_spec-Ruby 2.7.2-Puppet ~> 7:
-  stage: unit
-  image: ruby:2.7.2
-  script:
-    - bundle exec rake parallel_spec
-  variables:
-    PUPPET_GEM_VERSION: '~> 7'
-

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index cc96ece0513d69709b87af611173e2a6e4532f62..feb502c4f30fe0afbd4027968d6fbe2208e1c5bd 100644 (file)
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1 +1,5 @@
 --relative
+--no-relative_classname_inclusion-check
+--no-parameter_types-check
+--no-top_scope_facts-check
+--no-legacy_facts-check

diff --git a/.sync.yml b/.sync.yml
index 86e4340343592213d1a0da68a3a03c214190001b..66c2cfadeb1b98d9db0eb7f471e835b9f1a31530 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -7,7 +7,7 @@ Gemfile:
   optional:
     ":development":
       - gem: github_changelog_generator
-      version: '= 1.15.2'
+        version: '= 1.15.2'
 Rakefile:
   changelog_user: puppetlabs
   changelog_max_issues: 500

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644 (file)
index 444e17a..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-os: linux
-dist: xenial
-language: ruby
-cache: bundler
-before_install:
-  - bundle -v
-  - rm -f Gemfile.lock
-  - "# 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"
-  - "# Ignore exit code of SIGPIPE'd yes to not fail with shell's pipefail set"
-  - '[ -z "$RUBYGEMS_VERSION" ] || (yes || true) | gem update --system $RUBYGEMS_VERSION'
-  - gem --version
-  - bundle -v
-script:
-  - 'bundle exec rake $CHECK'
-bundler_args: --without system_tests
-rvm:
-  - 2.5.7
-stages:
-  - static
-  - spec
-  - acceptance
-  -
-    if: tag =~ ^v\d
-    name: deploy
-jobs:
-  fast_finish: true
-  include:
-    -
-      env: CHECK="validate lint check rubocop"
-      stage: static
-    -
-      env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
-      rvm: 2.5.7
-      stage: spec
-    -
-      env: DEPLOY_TO_FORGE=yes
-      stage: deploy
-branches:
-  only:
-    - main
-    - /^v\d/
-notifications:
-  email: false

diff --git a/Gemfile b/Gemfile
index 4ffa786083a343d612fc97cb6eb3b0b8e7c5f16b..a84b5ee8290e21a0d7952b76cf55245061b4a835 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -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]

diff --git a/Rakefile b/Rakefile
index 0f8754eb61e400db1d117cad5026f06d3ba6ff89..7fc43e080e738d2ebb1de245710522b47e8728f3 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -42,6 +42,10 @@ def changelog_future_release
 end
 
 PuppetLint.configuration.send('disable_relative')
+PuppetLint.configuration.send('disable_relative_classname_inclusion')
+PuppetLint.configuration.send('disable_parameter_types')
+PuppetLint.configuration.send('disable_top_scope_facts')
+PuppetLint.configuration.send('disable_legacy_facts')
 
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?
@@ -49,6 +53,7 @@ if Bundler.rubygems.find_name('github_changelog_generator').any?
     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 = "v3.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)."

diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644 (file)
index a70c01e..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-version: 1.1.x.{build}
-skip_branch_with_pr: true
-branches:
-  only:
-    - main
-    - release
-skip_commits:
-  message: /^\(?doc\)?.*/
-clone_depth: 10
-init:
-  - SET
-  - 'mkdir C:\ProgramData\PuppetLabs\code && exit 0'
-  - 'mkdir C:\ProgramData\PuppetLabs\facter && exit 0'
-  - 'mkdir C:\ProgramData\PuppetLabs\hiera && exit 0'
-  - 'mkdir C:\ProgramData\PuppetLabs\puppet\var && exit 0'
-environment:
-  matrix:
-    -
-      RUBY_VERSION: 25-x64
-      CHECK: validate lint check rubocop
-    -
-      PUPPET_GEM_VERSION: ~> 6.0
-      RUBY_VERSION: 25
-      CHECK: parallel_spec
-    -
-      PUPPET_GEM_VERSION: ~> 6.0
-      RUBY_VERSION: 25-x64
-      CHECK: parallel_spec
-matrix:
-  fast_finish: true
-install:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - bundle install --jobs 4 --retry 2 --without system_tests
-  - type Gemfile.lock
-build: off
-test_script:
-  - bundle exec puppet -V
-  - ruby -v
-  - gem -v
-  - bundle -v
-  - bundle exec rake %CHECK%
-notifications:
-  - provider: Email
-    to:
-      - nobody@nowhere.com
-    on_build_success: false
-    on_build_failure: false
-    on_build_status_changed: false

diff --git a/metadata.json b/metadata.json
index b8a73043fea2c5af1fa896bd16c568ddc1f011b3..bcb5efbbea52e5ac4d88ee7b68a1bd11c7cd92a4 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -84,5 +84,5 @@
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
   "template-ref": "2.7.1-0-g9a16c87",
-  "pdk-version": "2.5.0"
+  "pdk-version": "2.6.0"
 }

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 9b1fa6f264d1019af8007726d2df751a5716ffce..07db73426ecff37fc2d91c2aa5f4ee0f65b4cc61 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -46,6 +46,7 @@ RSpec.configure do |c|
   end
   c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
   c.after(:suite) do
+    RSpec::Puppet::Coverage.report!(0)
   end
 
   # Filter backtrace noise