pdksync - update os support and workflow/testing environment

.github/workflows/ci.yaml

@@ -16,7 +16,7 @@ jobs:
  puppet_version: [7]
 
  name: Check / Puppet ${{ matrix.puppet_version }}
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-24.04
  container: puppet/pdk:latest
 
  steps:
@@ -39,11 +39,11 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- os: ['rocky8', 'ub2204', 'deb11']
+ os: ['rocky8', 'ub2004', 'ub2204', 'ub2404', 'deb11', 'deb12']
  puppet_version: [7]
 
  name: Acceptance / ${{ matrix.os }} / Puppet ${{ matrix.puppet_version }}
- runs-on: ubuntu-22.04
+ runs-on: ubuntu-24.04
  needs:
  - check
 

metadata.json

@@ -49,7 +49,8 @@
  "operatingsystem": "Ubuntu",
  "operatingsystemrelease": [
  "20.04",
- "22.04"
+ "22.04",
+ "24.04"
  ]
  }
  ],

provision.yaml

@@ -1,31 +1,34 @@
 ---
 default:
  provisioner: docker_exp
- images: ['waffleimage/centos7']
+ images: ['litmusimage/rockylinux:8']
 vagrant:
  provisioner: vagrant
- images: ['centos/7', 'generic/ubuntu2004']
+ images: ['centos/8', 'generic/ubuntu2404']
 
 deb_all:
  provisioner: docker
- images: ['litmusimage/debian:10', 'litmusimage/debian:11']
+ images: ['litmusimage/debian:11', 'litmusimage/debian:12']
 el_all:
  provisioner: docker
- images: ['litmusimage/centos:7', 'litmusimage/centos:8']
+ images: ['litmusimage/centos:7', 'litmusimage/rockylinux:8']
  # The most reliable workaround for the docker/systemd incompatibility.
  # see https://github.com/docker/for-linux/issues/835
  # see https://github.com/moby/moby/issues/38749
  vars: '{docker_run_opts: ["-v /sys/fs/cgroup:/sys/fs/cgroup:ro"]}'
 ub_all:
  provisioner: docker
- images: ['litmusimage/ubuntu:20.04', 'litmusimage/ubuntu:22.04']
+ images: ['litmusimage/ubuntu:20.04', 'litmusimage/ubuntu:22.04', 'litmusimage/ubuntu:24.04']
 
 gha_deb10:
  provisioner: docker
  images: ['litmusimage/debian:10']
 gha_deb11:
  provisioner: docker
  images: ['litmusimage/debian:11']
+gha_deb12:
+ provisioner: docker
+ images: ['litmusimage/debian:12']
 gha_el7:
  provisioner: docker
  images: ['litmusimage/centos:7']
@@ -53,3 +56,6 @@ gha_ub2004:
 gha_ub2204:
  provisioner: docker
  images: ['litmusimage/ubuntu:22.04']
+gha_ub2404:
+ provisioner: docker
+ images: ['litmusimage/ubuntu:24.04']

spec/spec_helper_acceptance_local.rb

@@ -24,15 +24,26 @@ def setup_webserver
  MANIFEST
 
  if os[:family].eql?('debian')
- php_extensions = <<-MANIFEST
- gd => {},
- json => {},
- pdo => {},
- pgsql => {},
- mysqlnd => {},
- posix => {},
- sqlite3 => {},
- MANIFEST
+ php_extensions = if os[:release].to_i >= 12
+ <<-MANIFEST
+ gd => {},
+ pdo => {},
+ pgsql => {},
+ mysqlnd => {},
+ posix => {},
+ sqlite3 => {},
+ MANIFEST
+ else
+ <<-MANIFEST
+ gd => {},
+ json => {},
+ pdo => {},
+ pgsql => {},
+ mysqlnd => {},
+ posix => {},
+ sqlite3 => {},
+ MANIFEST
+ end
  end
 
  if os[:family].eql?('ubuntu')
@@ -137,7 +148,7 @@ class { 'apache::mod::fcgid':
  }
 
  apache::vhost { 'bacula_web':
- servername => $fqdn,
+ servername => $facts['networking']['fqdn'],
  port => 80,
  docroot => '/var/www/html/bacula-web/public',
  manage_docroot => false,