(maint) Use modern hosts for pdb integration testing

Author: justinstoller

acceptance/lib/helper.rb

@@ -63,13 +63,14 @@ def self.print_config
   def puppetdb_supported_platforms()
     [
       /debian-11/,
-      /debian-10/,
-      /el-7/,
+      /debian-12/,
       /el-8/,
+      /el-9/,
       /sles-12/,
       /sles-15/,
-      /ubuntu-18.04/,
-      /ubuntu-20.04/
+      /ubuntu-20.04/,
+      /ubuntu-22.04/,
+      /ubuntu-24.04/
     ]
   end
 

acceptance/suites/pre_suite/foss/95_install_pdb.rb

@@ -10,38 +10,19 @@
   on(master, "rm -f #{sitepp}")
 end
 
-# Puppet pulls in OpenSSL 3 which breaks ssl-cert < 1.1.1
-# Unfortunately we need jammy to bring a workable version of ssl-cert into bionic
-step 'Update Ubuntu 18 package repo' do
-  if master.platform =~ /ubuntu-18/
-    # There's a bunch of random crap that gets upgraded in our installs,
-    # just upgrade everything before we try to install postgres
-    on master, 'apt-get update'
-    on master, 'DEBIAN_FRONTEND=noninteractive apt-get upgrade --assume-yes --force-yes -o "DPkg::Options::=--force-confold"'
-    # Install jammy repos so we can pull in its ssl-cert
-    on master, "echo 'deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' > /etc/apt/sources.list.d/jammy.list"
-    on master, "echo 'deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' >> /etc/apt/sources.list.d/jammy.list"
-    on master, 'apt-get update'
-    on master, 'apt-get install -y -t jammy ssl-cert'
-    # Once we have jammy's ssl-cert get rid of jammy packages to avoid unintentially pulling in other packages
-    on master, 'rm /etc/apt/sources.list.d/jammy.list'
-    on master, 'apt-get update'
-
-    # bionic is EOL, so get postgresql from the archive
-    on master, 'echo "deb https://apt-archive.postgresql.org/pub/repos/apt bionic-pgdg main" >> /etc/apt/sources.list'
-    on master, 'curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -'
-    on master, 'apt update'
-  end
-end
-
 step 'Install Puppet nightly repo' do
   install_puppetlabs_release_repo_on(master, 'puppet8-nightly')
 end
 
-step 'Update EL 8 postgresql repos' do
-  if master.platform =~ /el-8/
-    # work around for testing on rhel8 and the repos on the image not finding the pg packages it needs
-    on master, "dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
+step 'Update EL postgresql repos' do
+  # work around for testing on rhel and the repos on the image not finding the pg packages it needs
+  if master.platform =~ /el-/
+    major_version = case master.platform
+      when /-8/ then 8
+      when /-9/ then 9
+      end
+
+    on master, "dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-#{major_version}-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
     on master, "dnf -qy module disable postgresql"
   end
 end
@@ -55,12 +36,11 @@
 end
 
 step 'Configure PuppetDB via site.pp' do
-  manage_package_repo = ! master.platform.match?(/ubuntu-18/)
   create_remote_file(master, sitepp, <<SITEPP)
 node default {
   class { 'puppetdb':
     manage_firewall     => false,
-    manage_package_repo => #{manage_package_repo},
+    manage_package_repo => true,
     postgres_version    => '14',
   }