Merge pull request #731 from puppetlabs/add-ubuntu-24-support

Add ubuntu 24 support

Author: shubhamshinde360

.fixtures.yml

@@ -6,7 +6,7 @@ fixtures:
     provision: "https://github.com/puppetlabs/provision.git"
     puppet_agent:
       repo: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
-      ref: v4.21.0
+      ref: v4.25.0
     package: "https://github.com/puppetlabs/puppetlabs-package.git"
     deploy_pe: "https://github.com/jarretlavallee/puppet-deploy_pe"
     sign_cert: "https://github.com/m0dular/sign_cert"

.github/workflows/ci.yml

@@ -18,4 +18,5 @@ jobs:
     uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
     with:
       runs_on: "ubuntu-24.04"
+      flags: "--nightly"
     secrets: "inherit"

.github/workflows/integration_test.yml

@@ -19,11 +19,11 @@ jobs:
       uses: actions/checkout@v3
       if: ${{ github.repository_owner == 'puppetlabs' }}
 
-    - name: Activate Ruby 2.7
+    - name: Activate Ruby 3.2
       uses: ruby/setup-ruby@v1
       if: ${{ github.repository_owner == 'puppetlabs' }}
       with:
-        ruby-version: "2.7"
+        ruby-version: "3.2"
         bundler-cache: true
 
     - name: Print bundle environment
@@ -61,10 +61,10 @@ jobs:
     - name: Checkout Source
       uses: actions/checkout@v3
 
-    - name: Activate Ruby 2.7
+    - name: Activate Ruby 3.2
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "2.7"
+        ruby-version: "3.2"
         bundler-cache: true
 
     - name: Print bundle environment

.github/workflows/nightly.yml

@@ -17,6 +17,7 @@ jobs:
     uses: "puppetlabs/cat-github-actions/.github/workflows/module_acceptance.yml@main"
     with:
       runs_on: "ubuntu-24.04"
+      flags: "--nightly"
     secrets: "inherit"
 
   Integration:

Gemfile

@@ -22,27 +22,31 @@ group :development do
   gem "racc", '~> 1.4.0',                        require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "deep_merge", '~> 1.2.2',                  require: false
   gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
-  gem "facterdb", '~> 2.1',                      require: false
+  gem "facterdb", '~> 2.1',                      require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "facterdb", '~> 3.0',                      require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "metadata-json-lint", '~> 4.0',            require: false
-  gem "rspec-puppet-facts", '~> 4.0',            require: false
+  gem "json-schema", '< 5.1.1',                  require: false
+  gem "rspec-puppet-facts", '~> 4.0',            require: false if Gem::Requirement.create(['< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "rspec-puppet-facts", '~> 5.0',            require: false if Gem::Requirement.create(['>= 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "dependency_checker", '~> 1.0.0',          require: false
   gem "parallel_tests", '= 3.12.1',              require: false
   gem "pry", '~> 0.10',                          require: false
   gem "simplecov-console", '~> 0.9',             require: false
-  gem "puppet-debugger", '~> 1.0',               require: false
+  gem "puppet-debugger", '~> 1.6',               require: false
   gem "rubocop", '~> 1.50.0',                    require: false
   gem "rubocop-performance", '= 1.16.0',         require: false
   gem "rubocop-rspec", '= 2.19.0',               require: false
   gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "rexml", '>= 3.3.9',                       require: false
+  gem "bigdecimal", '< 3.2.2',                   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "github_changelog_generator", '= 1.15.2',  require: false
 end
 group :development, :release_prep do
   gem "puppet-strings", '~> 4.0',         require: false
-  gem "puppetlabs_spec_helper", '~> 7.0', require: false
+  gem "puppetlabs_spec_helper", '~> 8.0', require: false
 end
 group :system_tests do
-  gem "puppet_litmus", '~> 1.0',   require: false, platforms: [:ruby, :x64_mingw]
+  gem "puppet_litmus", '~> 2.0',   require: false, platforms: [:ruby, :x64_mingw] if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
+  gem "puppet_litmus", '~> 1.0',   require: false, platforms: [:ruby, :x64_mingw] if ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
   gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "serverspec", '~> 2.41',     require: false
 end
@@ -53,12 +57,20 @@ hiera_version = ENV['HIERA_GEM_VERSION']
 
 gems = {}
 
-gems['puppet'] = location_for(puppet_version)
+puppet_version = ENV.fetch('PUPPET_GEM_VERSION', nil)
+facter_version = ENV.fetch('FACTER_GEM_VERSION', nil)
+hiera_version = ENV.fetch('HIERA_GEM_VERSION', nil)
 
-# If facter or hiera versions have been specified via the environment
-# variables
+# If PUPPET_FORGE_TOKEN is set then use authenticated source for both puppet and facter, since facter is a transitive dependency of puppet
+# Otherwise, do as before and use location_for to fetch gems from the default source
+if !ENV['PUPPET_FORGE_TOKEN'].to_s.empty?
+  gems['puppet'] = ['~> 8.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
+  gems['facter'] = ['~> 4.11', { require: false, source: 'https://rubygems-puppetcore.puppet.com' }]
+else
+  gems['puppet'] = location_for(puppet_version)
+  gems['facter'] = location_for(facter_version) if facter_version
+end
 
-gems['facter'] = location_for(facter_version) if facter_version
 gems['hiera'] = location_for(hiera_version) if hiera_version
 
 gems.each do |gem_name, gem_params|

data/Debian-12.yaml

@@ -0,0 +1,4 @@
+---
+ntp::package_name:
+  - ntpsec
+ntp::config: '/etc/ntpsec/ntp.conf'

data/Ubuntu-24.04.yaml

@@ -0,0 +1,4 @@
+---
+ntp::package_name:
+  - ntpsec
+ntp::config: '/etc/ntpsec/ntp.conf'

manifests/config.pp

@@ -33,8 +33,20 @@
       }
     }
     'Debian': {
-      if $facts['os']['release']['major'] == '12' {
-        $daemon_config = '/etc/ntpsec/ntp.conf'
+      if $facts['os']['name'] == 'Ubuntu' {
+        if (versioncmp($facts['os']['release']['major'], '18.04') >= 0 and
+          versioncmp($facts['os']['release']['major'], '24.04') < 0 and
+        $ntp::user) {
+          file_line { 'Set NTPD daemon user':
+            ensure => present,
+            path   => '/usr/lib/ntp/ntp-systemd-wrapper',
+            line   => "RUNASUSER=${ntp::user}",
+            match  => '^RUNASUSER\=',
+          }
+        }
+      }
+      if 'ntpsec' in $ntp::package_name {
+        $daemon_config = '/etc/default/ntpsec'
       } else {
         $daemon_config = '/etc/default/ntp'
       }
@@ -46,14 +58,6 @@
           match  => '^NTPD_OPTS\=',
         }
       }
-      if $ntp::user and $facts['os']['release']['major'] == '18.04' {
-        file_line { 'Set NTPD daemon user':
-          ensure => present,
-          path   => '/usr/lib/ntp/ntp-systemd-wrapper',
-          line   => "RUNASUSER=${ntp::user}",
-          match  => '^RUNASUSER\=',
-        }
-      }
     }
     'Suse': {
       $daemon_config = '/etc/sysconfig/ntp'

metadata.json

@@ -58,7 +58,8 @@
       "operatingsystemrelease": [
         "18.04",
         "20.04",
-        "22.04"
+        "22.04",
+        "24.04"
       ]
     },
     {
@@ -77,7 +78,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 9.0.0"
+      "version_requirement": ">= 8.0.0 < 9.0.0"
     }
   ],
   "description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux, Amazon Linux and Gentoo.",

spec/acceptance/ntp_parameters_spec.rb

@@ -24,6 +24,10 @@
 
 config = if os[:family] == 'solaris'
            '/etc/inet/ntp.conf'
+         elsif os[:family] == 'debian' && os[:release].start_with?('12')
+           '/etc/ntpsec/ntp.conf'
+         elsif os[:family] == 'ubuntu' && os[:release].start_with?('24')
+           '/etc/ntpsec/ntp.conf'
          else
            '/etc/ntp.conf'
          end