Merge branch 'main' into CONT-360-Syntax_update

Author: LukasAud

.sync.yml

@@ -8,12 +8,13 @@ Gemfile:
   optional:
     ":development":
     - gem: github_changelog_generator
+      version: '= 1.15.2'
 Rakefile:
   changelog_user: puppetlabs
   extras:
     - |
       require 'rspec/core/rake_task'
-      namespace :kubernetes do
+      namespace :ntp do
         RSpec::Core::RakeTask.new(:integration) do |t|
           t.pattern = 'spec/acceptance/**{,/*/**}/*_spec.rb'
           t.rspec_opts = "--tag integration"

Gemfile

@@ -14,8 +14,12 @@ def location_for(place_or_version, fake_version = nil)
 end
 
 group :development do
-  gem "json", '~> 2.0',                                require: false
-  gem "voxpupuli-puppet-lint-plugins", '~> 3.0',       require: false
+  gem "json", '= 2.1.0',                               require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.3.0',                               require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.5.1',                               require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.1',                               require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.6.3',                               require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "voxpupuli-puppet-lint-plugins", '~> 3.1',       require: false
   gem "facterdb", '~> 1.18',                           require: false
   gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0',     require: false
   gem "puppetlabs_spec_helper", '>= 3.0.0', '< 5.0.0', require: false
@@ -30,7 +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",                    require: false
+  gem "github_changelog_generator", '= 1.15.2',        require: false
 end
 group :system_tests do
   gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]

metadata.json

@@ -81,6 +81,6 @@
   ],
   "description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux, Amazon Linux and Gentoo.",
   "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
-  "template-ref": "tags/2.6.0-0-gd0490b9",
+  "template-ref": "2.7.1-0-g9a16c87",
   "pdk-version": "2.5.0"
 }

spec/acceptance/integration_ntp_spec.rb

@@ -9,9 +9,9 @@
     before(:all) { change_target_host('ntpserver') }
     after(:all) { reset_target_host }
     describe 'set up ntpserver' do
-      it 'check the date is 2022' do
+      it 'check the date is 2023' do
         result = run_shell('date')
-        expect(result.stdout).to match(%r{2022})
+        expect(result.stdout).to match(%r{2023})
       end
       pp = <<-MANIFEST
       class { 'ntp': }
@@ -25,9 +25,9 @@ class { 'ntp': }
     before(:all) { change_target_host('ntpclient') }
     after(:all) { reset_target_host }
     describe 'go to the future' do
-      it 'its 2022' do
+      it 'its 2023' do
         result = run_shell('date')
-        expect(result.stdout).to match(%r{2022})
+        expect(result.stdout).to match(%r{2023})
       end
       it 'install ntpdate' do
         apply_manifest("package { 'ntpdate': ensure => present }")
@@ -36,14 +36,14 @@ class { 'ntp': }
         result = run_shell('timedatectl set-ntp false')
         expect(result.exit_code).to eq(0)
       end
-      it 'go forward to 2023' do
+      it 'go forward to 2024' do
         result = run_shell('date --set="$(date --date="next year")"')
-        expect(result.stdout).to match(%r{2023})
+        expect(result.stdout).to match(%r{2024})
         expect(result.exit_code).to eq(0)
       end
-      it 'changed 2023' do
+      it 'changed 2024' do
         result = run_shell('date')
-        expect(result.stdout).to match(%r{2023})
+        expect(result.stdout).to match(%r{2024})
       end
     end
   end