Support Ubuntu 22.04

Author: treydock

.github/workflows/ci.yaml

@@ -39,6 +39,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+          cache-version: 2
           bundler: '2.1.0'
       - name: Validate
         run: bundle exec rake check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint
@@ -54,6 +55,7 @@ jobs:
           - "el8"
           - "el9"
           - "ubuntu-2004"
+          - "ubuntu-2204"
         puppet:
           - "puppet6"
           - "puppet7"
@@ -79,6 +81,7 @@ jobs:
         with:
           ruby-version: '2.7'
           bundler-cache: true
+          cache-version: 2
           bundler: '2.1.0'
       - name: Run tests
         run: bundle exec rake beaker

.sync.yml

@@ -11,6 +11,7 @@ Rakefile:
         - el8
         - el9
         - ubuntu-2004
+        - ubuntu-2204
       puppet:
         - puppet6
         - puppet7
@@ -29,3 +30,6 @@ spec/acceptance/nodesets/ubuntu-1804.yml:
 spec/acceptance/nodesets/ubuntu-2004.yml:
   packages:
     - cron
+spec/acceptance/nodesets/ubuntu-2204.yml:
+  packages:
+    - cron

manifests/init.pp

@@ -370,7 +370,7 @@
   $osname = $facts.dig('os', 'name')
   $osmajor = $facts.dig('os', 'release', 'major')
 
-  $supported = ['RedHat-7','RedHat-8','RedHat-9','Debian-20.04']
+  $supported = ['RedHat-7','RedHat-8','RedHat-9','Debian-20.04','Debian-22.04']
   $os = "${osfamily}-${osmajor}"
   if ! ($os in $supported) {
     fail("Unsupported OS: module ${module_name}. osfamily=${osfamily} osmajor=${osmajor} detected")

metadata.json

@@ -77,7 +77,8 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "20.04"
+        "20.04",
+        "22.04"
       ]
     }
   ],
@@ -94,5 +95,5 @@
   ],
   "pdk-version": "2.1.0",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
-  "template-ref": "heads/master-0-gc7a5ca2"
+  "template-ref": "heads/master-0-gdddb343"
 }

spec/acceptance/nodesets/el7.yml

@@ -10,6 +10,8 @@ HOSTS:
       - '/usr/sbin/init'
     docker_image_commands:
       - 'yum install -y wget which cronie iproute initscripts'
+      - 'wget --no-check-certificate https://copr.fedorainfracloud.org/coprs/jsynacek/systemd-backports-for-centos-7/repo/epel-7/jsynacek-systemd-backports-for-centos-7-epel-7.repo -O /etc/yum.repos.d/jsynacek-systemd-centos-7.repo'
+      - 'yum update -y systemd'
     docker_env:
       - LANG=en_US.UTF-8
       - LANGUAGE=en_US.UTF-8

spec/acceptance/nodesets/el8.yml

@@ -11,7 +11,7 @@ HOSTS:
     docker_image_commands:
       - 'dnf install -y dnf-utils'
       - 'dnf config-manager --set-enabled powertools'
-      - 'dnf install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks cpio'
+      - 'dnf install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks glibc-langpack-en cpio'
     docker_env:
       - LANG=en_US.UTF-8
       - LANGUAGE=en_US.UTF-8

spec/acceptance/nodesets/el9.yml

@@ -11,7 +11,7 @@ HOSTS:
     docker_image_commands:
       - 'dnf install -y dnf-utils'
       - 'dnf config-manager --set-enabled crb'
-      - 'dnf install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks cpio'
+      - 'dnf install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks glibc-langpack-en cpio'
     docker_env:
       - LANG=en_US.UTF-8
       - LANGUAGE=en_US.UTF-8

spec/acceptance/nodesets/ubuntu-2204.yml

@@ -0,0 +1,25 @@
+HOSTS:
+  ubuntu2204:
+    roles:
+      - agent
+    platform: ubuntu-22.04-amd64
+    hypervisor : docker
+    image: ubuntu:22.04
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
+      - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates cron'
+      - 'locale-gen en_US.UTF-8'
+    docker_env:
+      - LANG=en_US.UTF-8
+      - LANGUAGE=en_US.UTF-8
+      - LC_ALL=en_US.UTF-8
+    docker_container_name: 'openondemand-ubuntu2204'
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]
+

spec/spec_helper.rb

@@ -9,24 +9,24 @@
 
 require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
 
-include RspecPuppetFacts
+include RspecPuppetFacts # rubocop:disable Style/MixinUsage
 
 default_facts = {
   puppetversion: Puppet.version,
-  facterversion: Facter.version,
+  facterversion: Facter.version
 }
 
 default_fact_files = [
   File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml')),
-  File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml')),
+  File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml'))
 ]
 
 default_fact_files.each do |f|
   next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
   begin
     default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
-  rescue => e
+  rescue StandardError => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end
 end

spec/spec_helper_acceptance.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'beaker-rspec'
 require 'beaker-puppet'
 require 'beaker/puppet_install_helper'
 require 'beaker/module_install_helper'
 
-dir = File.expand_path(File.dirname(__FILE__))
+dir = __dir__
 Dir["#{dir}/acceptance/shared_examples/**/*.rb"].sort.each { |f| require f }
 require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb'))