tests: drop support for almalinux-8

almalinux-8 is going away since CentOS 8 EOL prevents use of the
advanced virtualization repository.

While we could change the YUM config to point to vault.centos.org,
rather than the mirror server, libvirt & QEMU both have a 2 year
cut off for support of the previous major version of a distro, so
it is not beneficial to invest time to keep almalinux 8 working.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

4 files changed, 5 insertions, 54 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ca1f0c..aca1626 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -233,13 +233,6 @@ unittests:
 .zypper_dry_run_command: &zypper_dry_run_command
   DRY_RUN_INSTALL_COMMAND: zypper install -y --dry-run
 
-x86_64-check-almalinux-8:
-  extends: .check_container_template
-  variables:
-    <<: *dnf_dry_run_command
-    IMAGE: docker.io/library/almalinux:8
-    NAME: almalinux-8
-
 x86_64-check-almalinux-9:
   extends: .check_container_template
   variables:
diff --git a/lcitool/ansible/playbooks/update/tasks/repos.yml b/lcitool/ansible/playbooks/update/tasks/repos.yml
index 3779c55..d5659f3 100644
--- a/lcitool/ansible/playbooks/update/tasks/repos.yml
+++ b/lcitool/ansible/playbooks/update/tasks/repos.yml
@@ -7,11 +7,6 @@
         - (os.name == 'CentOS' and os.version == 'Stream9') or
           (os.name == 'AlmaLinux' and os.version == '9')
 
-    - set_fact:
-        repo_name: 'PowerTools'
-      when:
-        - (os.name == 'AlmaLinux' and os.version == '8')
-
     - name: 'Lookup the {{ repo_name }} repo configuration file'
       find:
         paths: '/etc/yum.repos.d/'
@@ -42,10 +37,3 @@
     state: latest
   when:
     - os.name == 'CentOS'
-
-- name: Enable Advanced Virtualization repository
-  package:
-    name: centos-release-advanced-virtualization
-    state: latest
-  when:
-    - (os.name == 'AlmaLinux' and os.version == '8')
diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml
index 967ec11..75013a0 100644
--- a/lcitool/facts/mappings.yml
+++ b/lcitool/facts/mappings.yml
@@ -117,7 +117,6 @@ mappings:
     deb: ant-optional
     pkg: apache-ant
     rpm: ant-junit
-    AlmaLinux8:
 
   apparmor:
     deb: libapparmor-dev
@@ -160,7 +159,6 @@ mappings:
   bash-completion:
     default: bash-completion
     rpm: bash-completion-devel
-    AlmaLinux8: bash-completion
     AlmaLinux9: bash-completion
     CentOSStream9: bash-completion
     Fedora39: bash-completion
@@ -510,7 +508,6 @@ mappings:
     deb: libglusterfs-dev
     Fedora: glusterfs-api-devel
     OpenSUSE: glusterfs-devel
-    AlmaLinux8: glusterfs-api-devel
     armv6l-Debian:
     armv6l-Debian11: libglusterfs-dev
     armv6l-Debian12: libglusterfs-dev
@@ -677,7 +674,6 @@ mappings:
   junit:
     default: junit
     MacOS:
-    AlmaLinux8:
 
   libacl:
     apk: acl-dev
@@ -1134,7 +1130,6 @@ mappings:
     Fedora: libvirt-gobject-devel
     MacOS: libvirt-glib
     OpenSUSE: libvirt-glib-devel
-    AlmaLinux8: libvirt-gobject-devel
     cross-policy-default: foreign
 
   libxml2:
@@ -1298,7 +1293,6 @@ mappings:
 
   netcf:
     apk: netcf-dev
-    AlmaLinux8: netcf-devel
     Debian11: libnetcf-dev
     cross-policy-default: skip
 
@@ -1389,7 +1383,6 @@ mappings:
     apk: perl
     pkg: perl5
     MacOS: perl
-    AlmaLinux8: perl
 
   perl-App-cpanminus:
     apk: perl-app-cpanminus
@@ -1501,7 +1494,6 @@ mappings:
     rpm: perl-Sys-Hostname
     MacOS: perl
     OpenSUSE: perl-base
-    AlmaLinux8: perl
 
   perl-TAP-Formatter-HTML:
     deb: libtap-formatter-html-perl
@@ -1664,7 +1656,6 @@ mappings:
     pkg: py39-build
     rpm: python3-build
     MacOS: python-build
-    AlmaLinux8:
     OpenSUSELeap15:
     # Present but broken for our needs
     #  https://bugs.launchpad.net/ubuntu/+source/python-build/+bug/1992108
@@ -1956,7 +1947,6 @@ mappings:
     Fedora: spice-gtk3-devel
     MacOS: spice-gtk
     OpenSUSE: spice-gtk-devel
-    AlmaLinux8: spice-gtk3-devel
     cross-mingw32-rpm: mingw32-spice-gtk3
     cross-mingw64-rpm: mingw64-spice-gtk3
     cross-policy-default: foreign
@@ -1972,7 +1962,6 @@ mappings:
     pkg: libspice-server
     Fedora: spice-server-devel
     OpenSUSE: libspice-server-devel
-    AlmaLinux8: spice-server-devel
     mips-deb:
     s390x-deb:
     cross-policy-default: foreign
@@ -2105,7 +2094,6 @@ mappings:
   libguestfs-tools:
     deb: libguestfs-tools
     rpm: guestfs-tools
-    AlmaLinux8: libguestfs-tools-c
 
   vte:
     default: vte3
diff --git a/lcitool/formatters.py b/lcitool/formatters.py
index 83ddc21..28f8f38 100644
--- a/lcitool/formatters.py
+++ b/lcitool/formatters.py
@@ -289,32 +289,14 @@ class BuildEnvFormatter(Formatter):
                 # for the original CentOS distro and so the checks below apply
                 # there as well
                 #
-                # Starting with CentOS 8, most -devel packages are shipped in
-                # a separate repository which is not enabled by default. The
-                # name of this repository has changed over time
-                commands.extend([
-                    "{nosync}{packaging_command} install 'dnf-command(config-manager)' -y",
-                ])
-                if osversion in ["9", "Stream9"]:
-                    commands.extend([
-                        "{nosync}{packaging_command} config-manager --set-enabled -y crb",
-                    ])
-                if osversion in ["8"]:
-                    commands.extend([
-                        "{nosync}{packaging_command} config-manager --set-enabled -y powertools",
-                    ])
-
-                # Not all of the virt related -devel packages are provided by
-                # virt:rhel module so we have to enable AV repository as well.
-                # CentOS Stream 9 no longer uses modules for virt
-                if osversion in ["8"]:
-                    commands.extend([
-                        "{nosync}{packaging_command} install -y centos-release-advanced-virtualization",
-                    ])
-
+                # Most -devel packages are shipped in the separate 'crb' repository
+                # which is not enabled by default.
+                #
                 # Some of the packages we need are not part of CentOS proper
                 # and are only available through EPEL
                 commands.extend([
+                    "{nosync}{packaging_command} install 'dnf-command(config-manager)' -y",
+                    "{nosync}{packaging_command} config-manager --set-enabled -y crb",
                     "{nosync}{packaging_command} install -y epel-release",
                 ])