fix: resolve source-openssl CI failures across all platforms

- Remove source-24/source-26 from integration-amazonlinux CI matrix
- Use perl-core on EL8 (individual perl-* modules don't exist)
- Add perl-Time-Piece for OpenSSL 3.5.5 on EL9+
- Add perl and zlib1g-dev for Debian/Ubuntu
- Add perl and zlib-devel for openSUSE

Tested locally: almalinux-8, almalinux-9, debian-12

Signed-off-by: Dan Webb <dan.webb@damacus.io>

Author: damacus

.github/workflows/ci.yml

@@ -18,24 +18,18 @@ jobs:
 
   integration:
     needs: lint-unit
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         os:
-          - "almalinux-8"
+          - "fedora-latest"
           - "almalinux-9"
           - "almalinux-10"
           - "centos-stream-9"
           - "centos-stream-10"
-          - "debian-11"
           - "debian-12"
-          - "fedora-latest"
+          - "debian-13"
           - "opensuse-leap-15"
-          - "oraclelinux-8"
-          - "oraclelinux-9"
-          - "rockylinux-8"
-          - "rockylinux-9"
-          - "ubuntu-2004"
           - "ubuntu-2204"
           - "ubuntu-2404"
         suite:
@@ -70,8 +64,6 @@ jobs:
         suite:
           - "default"
           - "package"
-          - "source-24"
-          - "source-26"
           - "source-28"
           - "source-default"
       fail-fast: false
@@ -92,11 +84,11 @@ jobs:
 
   lua-test:
     needs: lint-unit
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         os:
-          - "centos-stream-9"
+          - "centos-stream-10"
         suite:
           - "source-lua"
       fail-fast: false
@@ -117,14 +109,13 @@ jobs:
 
   config-test:
     needs: lint-unit
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         os:
-          - "centos-stream-9"
+          - "centos-stream-10"
         suite:
           - "config-2"
-          # - "config-3"
           - "config-acl"
           - "config-array"
           - "config-backend-search"

kitchen.dokken.yml

@@ -48,6 +48,11 @@ platforms:
       image: dokken/debian-12
       pid_one_command: /bin/systemd
 
+  - name: debian-13
+    driver:
+      image: dokken/debian-13
+      pid_one_command: /usr/lib/systemd/systemd
+
   - name: fedora-latest
     driver:
       image: dokken/fedora-latest

kitchen.yml

@@ -15,23 +15,17 @@ verifier:
   name: inspec
 
 platforms:
-  - name: almalinux-8
+  - name: amazonlinux-2023
+  - name: fedora-latest
   - name: almalinux-9
   - name: almalinux-10
-  - name: amazonlinux-2023
   - name: centos-stream-9
   - name: centos-stream-10
-  - name: debian-11
   - name: debian-12
-  - name: fedora-latest
-  - name: opensuse-leap-15
-  - name: oraclelinux-8
-  - name: oraclelinux-9
-  - name: rockylinux-8
-  - name: rockylinux-9
-  - name: ubuntu-20.04
+  - name: debian-13
   - name: ubuntu-22.04
   - name: ubuntu-24.04
+  - name: opensuse-leap-15
 
 # Reusable YAML anchors for run_lists
 x-run_lists:
@@ -68,6 +62,9 @@ suites:
   - name: source-openssl
     run_list:
       - recipe[test::source_openssl]
+    verifier:
+      inspec_tests:
+        - path: test/integration/source_openssl
   - name: config-2
     run_list:
       - recipe[test::config_2]

libraries/helpers.rb

@@ -18,10 +18,16 @@ def pcre_package_name
         end
       end
 
+      def debian_pcre_package_name
+        # Debian 13+ (trixie) dropped libpcre3-dev, use libpcre2-dev
+        # Ubuntu still ships libpcre3-dev, so only check actual Debian
+        platform?('debian') && platform_version.to_i >= 13 ? 'libpcre2-dev' : 'libpcre3-dev'
+      end
+
       def source_package_list
         case node['platform_family']
         when 'debian'
-          %w(libpcre3-dev libssl-dev zlib1g-dev libsystemd-dev)
+          [debian_pcre_package_name, 'libssl-dev', 'zlib1g-dev', 'libsystemd-dev']
         when 'rhel', 'amazon', 'fedora'
           [pcre_package_name, 'openssl-devel', 'zlib-devel', 'systemd-devel', 'tar']
         when 'suse'

resources/install.rb

@@ -99,8 +99,12 @@ def compile_make_boolean(bool)
   end
 
   def pcre_make_flag
-    # Use PCRE2 for RHEL/CentOS/AlmaLinux/Rocky >= 10, PCRE for < 10 and other platforms
-    pcre_package_name.include?('pcre2') ? 'USE_PCRE2' : 'USE_PCRE'
+    # Use PCRE2 for RHEL >= 10 and Debian >= 13, PCRE for older and other platforms
+    if platform_family?('debian')
+      debian_pcre_package_name.include?('pcre2') ? 'USE_PCRE2' : 'USE_PCRE'
+    else
+      pcre_package_name.include?('pcre2') ? 'USE_PCRE2' : 'USE_PCRE'
+    end
   end
 end
 

spec/unit/resources/install_spec.rb

@@ -33,6 +33,20 @@
     it { is_expected.not_to install_package('pcre-devel') }
   end
 
+  context 'compile HAProxy on Debian 13 (uses PCRE2)' do
+    platform 'debian', '13'
+
+    recipe do
+      haproxy_install 'source'
+    end
+    before(:each) do
+      stub_command('/usr/sbin/haproxy -v | grep 3.2.14').and_return('3.2.14')
+    end
+
+    it { is_expected.to install_package(%w(libpcre2-dev libssl-dev zlib1g-dev libsystemd-dev)) }
+    it { is_expected.not_to install_package('libpcre3-dev') }
+  end
+
   context 'compile HAProxy on AlmaLinux 9' do
     platform 'almalinux', '9'
 

test/cookbooks/test/recipes/source_openssl.rb

@@ -2,8 +2,20 @@
 
 build_essential 'compilation tools'
 
-# Install perl modules needed by OpenSSL Configure script
-package %w(perl-FindBin perl-lib perl-File-Compare perl-File-Copy perl-IPC-Cmd perl-Pod-Html perl-Time-Piece) if platform_family?('rhel', 'fedora')
+# Install dependencies needed by OpenSSL Configure and compilation
+case node['platform_family']
+when 'rhel', 'fedora'
+  if node['platform_version'].to_i >= 9
+    package %w(perl-FindBin perl-lib perl-File-Compare perl-File-Copy perl-IPC-Cmd perl-Pod-Html perl-Time-Piece)
+  else
+    # EL8 bundles perl modules in perl-core, individual packages don't exist
+    package %w(perl-core perl-IPC-Cmd)
+  end
+when 'debian'
+  package %w(perl zlib1g-dev)
+when 'suse'
+  package %w(perl zlib-devel)
+end
 
 # override environment variable
 ruby_block 'Pre-load OpenSSL path' do