Merge branch 'OSC:master' into git_proxy

Author: elawrence42

.github/workflows/ci.yaml

@@ -19,10 +19,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: 2.7.8
-            puppet: 7
-            fixtures: .fixtures.yml
-            allow_failure: false
           - ruby: 3.2.3
             puppet: 8
             fixtures: .fixtures.yml
@@ -53,13 +49,11 @@ jobs:
         set:
           - "el8"
           - "el9"
-          - "amazon2023"
           - "ubuntu-2004"
           - "ubuntu-2204"
           - "ubuntu-2404"
           - "debian-12"
         puppet:
-          - "puppet7"
           - "puppet8"
     env:
       BUNDLE_WITHOUT: development:release

.sync.yml

@@ -8,16 +8,15 @@ Rakefile:
   workflow_dispatch: true
   acceptance_matrix:
       set:
-        - ---el7
         - el8
         - el9
-        - amazon2023
+        # Add back once able to get past container start stage
+        # - amazon2023
         - ubuntu-2004
         - ubuntu-2204
         - ubuntu-2404
         - debian-12
       puppet:
-        - puppet7
         - puppet8
 .gitlab-ci.yml:
   delete: true

Gemfile

@@ -17,19 +17,19 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
-  gem "voxpupuli-test", '7.0.0',    require: false
+  gem "voxpupuli-test", '9.2.1',    require: false
   gem "faraday", '~> 1.0',          require: false
   gem "github_changelog_generator", require: false
   gem "puppet-blacksmith",          require: false
   gem "puppet-strings",             require: false
 end
 group :system_tests do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.29')
+  gem "beaker",                                                                  require: false
   gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
   gem "beaker-pe",                                                               require: false
   gem "beaker-hostgenerator"
   gem "beaker-rspec"
-  gem "beaker-docker",               git: 'https://github.com/treydock/beaker-docker.git', branch: 'amazon-2023'
+  gem "beaker-docker", '~> 2.2.0',                                               require: false
   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

metadata.json

@@ -91,7 +91,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 9.0.0"
+      "version_requirement": ">= 8.0.0 < 9.0.0"
     }
   ],
   "tags": [
@@ -101,5 +101,5 @@
   ],
   "pdk-version": "3.4.0",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
-  "template-ref": "heads/master-0-g3c12381"
+  "template-ref": "heads/master-0-g2230aca"
 }

spec/acceptance/nodesets/amazon2023.yml

@@ -2,15 +2,15 @@ HOSTS:
   amazon-2023:
     roles:
       - agent
-    platform: amazon-2023-x86_64
+    platform: el-9-x86_64
     hypervisor: docker
-    image: amazonlinux:2023
+    image: amazonlinux:2023.8.20250908.0
     docker_preserve_image: true
-    docker_cmd:
-      - '/usr/sbin/init'
+    docker_cmd: '/usr/sbin/init'
     docker_image_commands:
       - 'dnf install -y dnf-utils'
       - 'dnf install -y wget which cronie iproute initscripts langpacks-en glibc-all-langpacks glibc-langpack-en cpio'
+      - 'cp /bin/true /sbin/agetty'
     docker_env:
       - LANG=en_US.UTF-8
       - LANGUAGE=en_US.UTF-8