lcitool: Enable more EPEL packages on CentOS Stream 9 / AlmaLinux 9

Several packages have been added since EPEL started supporting
CentOS Stream 9.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>

4 files changed, 16 insertions, 18 deletions

diff --git a/guests/lcitool/lcitool/ansible/vars/mappings.yml b/guests/lcitool/lcitool/ansible/vars/mappings.yml
index ad06330..67b8009 100644
--- a/guests/lcitool/lcitool/ansible/vars/mappings.yml
+++ b/guests/lcitool/lcitool/ansible/vars/mappings.yml
@@ -200,9 +200,6 @@ mappings:
     rpm: capstone-devel
     MacOS: capstone
     OpenSUSE:
-    # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
-    AlmaLinux9:
-    CentOSStream9:
     cross-policy-default: foreign
 
   cargo:
@@ -212,9 +209,6 @@ mappings:
 
   ccache:
     default: ccache
-    # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
-    AlmaLinux9:
-    CentOSStream9:
 
   check:
     default: check
@@ -828,9 +822,6 @@ mappings:
     deb: libjemalloc-dev
     rpm: jemalloc-devel
     MacOS: jemalloc
-    # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
-    AlmaLinux9:
-    CentOSStream9:
     cross-policy-default: foreign
 
   libjpeg:
@@ -991,9 +982,6 @@ mappings:
     apk: libssh2-dev
     deb: libssh2-1-dev
     rpm: libssh2-devel
-    # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
-    AlmaLinux9:
-    CentOSStream9:
     cross-mingw32-rpm: mingw32-libssh2
     cross-mingw64-rpm: mingw64-libssh2
     cross-policy-default: foreign
@@ -1360,9 +1348,6 @@ mappings:
     deb: libio-interface-perl
     pkg: p5-IO-Interface
     rpm: perl-IO-Interface
-    # FIXME Drop once EPEL for AlmaLinux 9 / CentOS Stream 9 adds the package
-    AlmaLinux9:
-    CentOSStream9:
 
   perl-IO-String:
     apk: perl-io-string
diff --git a/guests/lcitool/tests/data/manifest/out/ci/containers/centos-stream-9.Dockerfile b/guests/lcitool/tests/data/manifest/out/ci/containers/centos-stream-9.Dockerfile
index 93146c8..1b72aad 100644
--- a/guests/lcitool/tests/data/manifest/out/ci/containers/centos-stream-9.Dockerfile
+++ b/guests/lcitool/tests/data/manifest/out/ci/containers/centos-stream-9.Dockerfile
@@ -7,6 +7,7 @@ RUN dnf distro-sync -y && \
     dnf install -y epel-next-release && \
     dnf install -y \
         ca-certificates \
+        ccache \
         gcc \
         git \
         glib2-devel \
@@ -15,6 +16,10 @@ RUN dnf distro-sync -y && \
         pkgconfig && \
     dnf autoremove -y && \
     dnf clean all -y && \
-    rpm -qa | sort > /packages.txt
+    rpm -qa | sort > /packages.txt && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
 ENV LANG "en_US.UTF-8"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/guests/lcitool/tests/data/packages/out/almalinux-9.yml b/guests/lcitool/tests/data/packages/out/almalinux-9.yml
index b1e2da9..bfb592f 100644
--- a/guests/lcitool/tests/data/packages/out/almalinux-9.yml
+++ b/guests/lcitool/tests/data/packages/out/almalinux-9.yml
@@ -1,5 +1,4 @@
 cpan:
-- IO::Interface
 - LWP::UserAgent
 - Net::OpenSSH
 - TAP::Formatter::HTML
@@ -23,7 +22,9 @@ native:
 - bzip2
 - bzip2-devel
 - ca-certificates
+- capstone-devel
 - cargo
+- ccache
 - check-devel
 - chrony
 - clang
@@ -78,6 +79,7 @@ native:
 - iptables
 - iscsi-initiator-utils
 - java-11-openjdk-headless
+- jemalloc-devel
 - jna
 - jq
 - json-glib-devel
@@ -109,6 +111,7 @@ native:
 - libselinux-devel
 - libsoup-devel
 - libssh-devel
+- libssh2-devel
 - libtasn1-devel
 - libtirpc-devel
 - libtool
@@ -157,6 +160,7 @@ native:
 - perl-ExtUtils-CBuilder
 - perl-File-Slurp
 - perl-IO-Compress-Bzip2
+- perl-IO-Interface
 - perl-IO-String
 - perl-Module-Build
 - perl-Net-SNMP
diff --git a/guests/lcitool/tests/data/packages/out/centos-stream-9.yml b/guests/lcitool/tests/data/packages/out/centos-stream-9.yml
index b1e2da9..bfb592f 100644
--- a/guests/lcitool/tests/data/packages/out/centos-stream-9.yml
+++ b/guests/lcitool/tests/data/packages/out/centos-stream-9.yml
@@ -1,5 +1,4 @@
 cpan:
-- IO::Interface
 - LWP::UserAgent
 - Net::OpenSSH
 - TAP::Formatter::HTML
@@ -23,7 +22,9 @@ native:
 - bzip2
 - bzip2-devel
 - ca-certificates
+- capstone-devel
 - cargo
+- ccache
 - check-devel
 - chrony
 - clang
@@ -78,6 +79,7 @@ native:
 - iptables
 - iscsi-initiator-utils
 - java-11-openjdk-headless
+- jemalloc-devel
 - jna
 - jq
 - json-glib-devel
@@ -109,6 +111,7 @@ native:
 - libselinux-devel
 - libsoup-devel
 - libssh-devel
+- libssh2-devel
 - libtasn1-devel
 - libtirpc-devel
 - libtool
@@ -157,6 +160,7 @@ native:
 - perl-ExtUtils-CBuilder
 - perl-File-Slurp
 - perl-IO-Compress-Bzip2
+- perl-IO-Interface
 - perl-IO-String
 - perl-Module-Build
 - perl-Net-SNMP