Major updates - READ DESCRIPTION

* Drop Debian 10 * Drop EL7 * Add Debian 11 and Debian 12 * Add Ubuntu 22.04
treydock · Oct 14, 2024 · 80732f4 · 80732f4
1 parent a7c490a
commit 80732f4
Show file tree

Hide file tree

Showing 19 changed files with 144 additions and 81 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -10,5 +10,8 @@ fixtures:
       repo: puppet/logrotate
     yum:
       repo: puppet/yum
+    # Needed by logrotate
+    systemd:
+      repo: puppet/systemd
   symlinks:
     nhc: "#{source_dir}"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,11 +16,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: 2.7.7
+          - ruby: 2.7.8
             puppet: 7
             fixtures: .fixtures.yml
             allow_failure: false
-          - ruby: 3.2.2
+          - ruby: 3.2.3
             puppet: 8
             fixtures: .fixtures.yml
             allow_failure: false

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -59,7 +59,15 @@ Style/TernaryParentheses:
 Style/TrailingCommaInArguments:
   Description: Prefer always trailing comma on multiline argument lists. This makes
     diffs, and re-ordering nicer.
-  EnforcedStyleForMultiline: comma
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInArrayLiteral:
+  Description: Prefer always trailing comma on multiline argument lists. This makes
+    diffs, and re-ordering nicer.
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInHashLiteral:
+  Description: Prefer always trailing comma on multiline argument lists. This makes
+    diffs, and re-ordering nicer.
+  EnforcedStyleForMultiline: consistent_comma
 Style/SymbolArray:
   Description: Using percent style obscures symbolic intent of array's contents.
   EnforcedStyle: brackets

diff --git a/.sync.yml b/.sync.yml
@@ -31,14 +31,17 @@ spec/acceptance/nodesets/el8.yml:
 spec/acceptance/nodesets/el9.yml:
   packages:
     - git
-spec/acceptance/nodesets/debian-10.yml:
+spec/acceptance/nodesets/debian-11.yml:
+  packages:
+    - git
+spec/acceptance/nodesets/debian-12.yml:
   packages:
     - git
-spec/acceptance/nodesets/debian-11.yml:
-  delete: true
 spec/acceptance/nodesets/ubuntu-2004.yml:
   packages:
     - cron
     - git
 spec/acceptance/nodesets/ubuntu-2204.yml:
-  delete: true
+  packages:
+    - cron
+    - git
diff --git a/Gemfile b/Gemfile
@@ -17,7 +17,7 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
-  gem "voxpupuli-test", '5.4.1',    require: false
+  gem "voxpupuli-test", '7.0.0',    require: false
   gem "faraday", '~> 1.0',          require: false
   gem "github_changelog_generator", require: false
   gem "puppet-blacksmith",          require: false
@@ -29,8 +29,8 @@ group :system_tests do
   gem "beaker-pe",                                                               require: false
   gem "beaker-hostgenerator"
   gem "beaker-rspec"
-  gem "beaker-docker"
-  gem "beaker-puppet"
+  gem "beaker-docker",               git: 'https://github.com/treydock/beaker-docker.git', branch: 'amazon-2023'
+  gem "beaker-puppet",               git: 'https://github.com/puppetlabs/beaker-puppet.git', ref: '6063d22b6c4449df795731f5853c3c75241240c4'
   gem "beaker-puppet_install_helper",                                            require: false
   gem "beaker-module_install_helper",                                            require: false
 end

diff --git a/manifests/conf.pp b/manifests/conf.pp
@@ -81,7 +81,7 @@
     'NAME'                      => $program_name,
   }
 
-  $configs = merge($default_configs, $config_overrides)
+  $configs = $default_configs + $config_overrides
 
   if $_conf_dir != $nhc::conf_dir {
     file { $_conf_dir:

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -136,7 +136,7 @@
     'NAME'                      => $program_name,
   }
 
-  $configs = merge($default_configs, $config_overrides)
+  $configs = $default_configs + $config_overrides
 
   contain nhc::install
   contain nhc::config

diff --git a/metadata.json b/metadata.json
@@ -29,17 +29,10 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
     },
-    {
-      "operatingsystem": "CentOS",
-      "operatingsystemrelease": [
-        "7"
-      ]
-    },
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
@@ -57,13 +50,15 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "10"
+        "11",
+        "12"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "20.04"
+        "20.04",
+        "22.04"
       ]
     }
   ],
@@ -80,5 +75,5 @@
   ],
   "pdk-version": "2.7.1",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
-  "template-ref": "heads/master-0-g70732db"
+  "template-ref": "heads/master-0-g39aea04"
 }
diff --git a/spec/acceptance/02_nhc_from_source_spec.rb b/spec/acceptance/02_nhc_from_source_spec.rb
@@ -53,7 +53,7 @@ class { 'nhc':
         expected = [
           '* || export MARK_OFFLINE=0',
           '* || check_fs_mount_rw -f /',
-          '* || check_fs_mount_rw -t tmpfs -f /tmp'
+          '* || check_fs_mount_rw -t tmpfs -f /tmp',
         ]
         expect(content).to match_array(expected)
       end
@@ -68,7 +68,7 @@ class { 'nhc':
           'DETACHED_MODE=0',
           'DETACHED_MODE_FAIL_NODATA=0',
           'INCDIR=/etc/nhc/scripts',
-          'NAME=nhc'
+          'NAME=nhc',
         ]
         expect(content).to match_array(expected)
       end

diff --git a/spec/acceptance/nodesets/debian-10.yml → spec/acceptance/nodesets/debian-11.yml b/spec/acceptance/nodesets/debian-10.yml → spec/acceptance/nodesets/debian-11.yml
@@ -1,10 +1,10 @@
 HOSTS:
-  debian10:
+  debian11:
     roles:
       - agent
-    platform: debian-10-amd64
+    platform: debian-11-amd64
     hypervisor: docker
-    image: debian:10
+    image: debian:11
     docker_preserve_image: true
     docker_cmd:
       - '/sbin/init'
@@ -18,7 +18,7 @@ HOSTS:
       - LANG=en_US.UTF-8
       - LANGUAGE=en_US.UTF-8
       - LC_ALL=en_US.UTF-8
-    docker_container_name: 'nhc-debian10'
+    docker_container_name: 'nhc-debian11'
 CONFIG:
   log_level: debug
   type: foss

diff --git a/spec/acceptance/nodesets/debian-12.yml b/spec/acceptance/nodesets/debian-12.yml
@@ -0,0 +1,28 @@
+HOSTS:
+  debian12:
+    roles:
+      - agent
+    platform: debian-12-amd64
+    hypervisor: docker
+    image: debian:12
+    docker_preserve_image: true
+    docker_cmd:
+      - '/sbin/init'
+    docker_image_commands:
+      - 'apt-get install -y wget net-tools systemd-sysv locales apt-transport-https ca-certificates git'
+      - 'echo "LC_ALL=en_US.UTF-8" >> /etc/environment'
+      - 'echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen'
+      - 'echo "LANG=en_US.UTF-8" > /etc/locale.conf'
+      - '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: 'nhc-debian12'
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]
+
diff --git a/spec/acceptance/nodesets/el8.yml b/spec/acceptance/nodesets/el8.yml
@@ -1,10 +1,10 @@
 HOSTS:
-  rocky-8:
+  el8:
     roles:
       - agent
     platform: el-8-x86_64
     hypervisor: docker
-    image: almalinux:8
+    image: rockylinux:8
     docker_preserve_image: true
     docker_cmd:
       - '/usr/sbin/init'

diff --git a/spec/acceptance/nodesets/el9.yml b/spec/acceptance/nodesets/el9.yml
@@ -1,10 +1,10 @@
 HOSTS:
-  almalinux-9:
+  el9:
     roles:
       - agent
     platform: el-9-x86_64
     hypervisor: docker
-    image: almalinux:9
+    image: rockylinux:9
     docker_preserve_image: true
     docker_cmd:
       - '/usr/sbin/init'

diff --git a/spec/acceptance/nodesets/ubuntu-2204.yml b/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 git'
+      - '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: 'nhc-ubuntu2204'
+CONFIG:
+  log_level: debug
+  type: foss
+ssh:
+  password: root
+  auth_methods: ["password"]
+