ci: Switch from AlmaLinux 8 to AlmaLinux 9

By the time of release, it's going to be more than two years
since AlmaLinux 9 was released and per our support policy,
AlmaLinux 8 (the previous major release) will be not supported.
Switch from AlmaLinux 8 to AlmaLinux 9.

This also means the website_job which depends on AlmaLinux 8
needs to be moved to newer AlmaLinux.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b879b88f744195a7edaba44261b92f38e9f70d04..81ac2ecddd69aa8a4b3b777fb45c1eb0336b4973 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ include:
 website_job:
   extends: .gitlab_native_build_job
   needs:
-    - job: x86_64-almalinux-8-container
+    - job: x86_64-almalinux-9-container
       optional: true
   script:
     - source ci/jobs.sh
@@ -83,8 +83,8 @@ website_job:
     paths:
       - website
   variables:
-    NAME: almalinux-8
-    TARGET_BASE_IMAGE: docker.io/library/almalinux:8
+    NAME: almalinux-9
+    TARGET_BASE_IMAGE: docker.io/library/almalinux:9
 
 # On push to master publish the website from 'website_job' via gitlab pages
 pages:

diff --git a/ci/buildenv/almalinux-8.sh b/ci/buildenv/almalinux-9.sh
similarity index 93%
rename from ci/buildenv/almalinux-8.sh
rename to ci/buildenv/almalinux-9.sh
index a962576414230238db98e64b7ae5d138c2b0239d..f0826e1313de9f05f67af51737ac380b178d471c 100644 (file)
--- a/ci/buildenv/almalinux-8.sh
+++ b/ci/buildenv/almalinux-9.sh
@@ -7,8 +7,7 @@
 function install_buildenv() {
     dnf update -y
     dnf install 'dnf-command(config-manager)' -y
-    dnf config-manager --set-enabled -y powertools
-    dnf install -y centos-release-advanced-virtualization
+    dnf config-manager --set-enabled -y crb
     dnf install -y epel-release
     dnf install -y \
         audit-libs-devel \
@@ -17,6 +16,7 @@ function install_buildenv() {
         ca-certificates \
         ccache \
         clang \
+        clang-devel \
         cpp \
         cyrus-sasl-devel \
         device-mapper-devel \
@@ -31,7 +31,6 @@ function install_buildenv() {
         glib2-devel \
         glibc-devel \
         glibc-langpack-en \
-        glusterfs-api-devel \
         gnutls-devel \
         grep \
         iproute \
@@ -61,13 +60,12 @@ function install_buildenv() {
         lvm2 \
         make \
         meson \
-        netcf-devel \
         nfs-utils \
         ninja-build \
         numactl-devel \
         numad \
         parted-devel \
-        perl \
+        perl-base \
         pkgconfig \
         polkit \
         python3 \

diff --git a/ci/containers/almalinux-8.Dockerfile b/ci/containers/almalinux-9.Dockerfile
similarity index 91%
rename from ci/containers/almalinux-8.Dockerfile
rename to ci/containers/almalinux-9.Dockerfile
index af8a7b24d42457f350cb1e904b52cf1261d5aec1..68608b12a909022f39210299d412e7e334d434ac 100644 (file)
--- a/ci/containers/almalinux-8.Dockerfile
+++ b/ci/containers/almalinux-9.Dockerfile
@@ -4,12 +4,11 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM docker.io/library/almalinux:8
+FROM docker.io/library/almalinux:9
 
 RUN dnf update -y && \
     dnf install 'dnf-command(config-manager)' -y && \
-    dnf config-manager --set-enabled -y powertools && \
-    dnf install -y centos-release-advanced-virtualization && \
+    dnf config-manager --set-enabled -y crb && \
     dnf install -y epel-release && \
     dnf install -y \
         audit-libs-devel \
@@ -18,6 +17,7 @@ RUN dnf update -y && \
         ca-certificates \
         ccache \
         clang \
+        clang-devel \
         cpp \
         cyrus-sasl-devel \
         device-mapper-devel \
@@ -32,7 +32,6 @@ RUN dnf update -y && \
         glib2-devel \
         glibc-devel \
         glibc-langpack-en \
-        glusterfs-api-devel \
         gnutls-devel \
         grep \
         iproute \
@@ -62,13 +61,12 @@ RUN dnf update -y && \
         lvm2 \
         make \
         meson \
-        netcf-devel \
         nfs-utils \
         ninja-build \
         numactl-devel \
         numad \
         parted-devel \
-        perl \
+        perl-base \
         pkgconfig \
         polkit \
         python3 \

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 1629e025258611c62bd24748c9bf292a2edda967..6ed5c578ddb96449ba3f6bd6d253a9d68a0e1a46 100644 (file)
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -7,30 +7,30 @@
 
 # Native build jobs
 
-x86_64-almalinux-8:
+x86_64-almalinux-9:
   extends: .native_build_job
   needs:
-    - job: x86_64-almalinux-8-container
+    - job: x86_64-almalinux-9-container
       optional: true
   allow_failure: false
   variables:
     JOB_OPTIONAL: 1
-    NAME: almalinux-8
+    NAME: almalinux-9
     RPM: skip
-    TARGET_BASE_IMAGE: docker.io/library/almalinux:8
+    TARGET_BASE_IMAGE: docker.io/library/almalinux:9
 
 
-x86_64-almalinux-8-clang:
+x86_64-almalinux-9-clang:
   extends: .native_build_job
   needs:
-    - job: x86_64-almalinux-8-container
+    - job: x86_64-almalinux-9-container
       optional: true
   allow_failure: false
   variables:
     CC: clang
-    NAME: almalinux-8
+    NAME: almalinux-9
     RPM: skip
-    TARGET_BASE_IMAGE: docker.io/library/almalinux:8
+    TARGET_BASE_IMAGE: docker.io/library/almalinux:9
 
 
 x86_64-alpine-319:

diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index b7ae60b10addeb0de28d64f72d0b32b014a5626d..c1e7a0a67efd86a4bdff6166883e4e7864979d0a 100644 (file)
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -7,11 +7,11 @@
 
 # Native container jobs
 
-x86_64-almalinux-8-container:
+x86_64-almalinux-9-container:
   extends: .container_job
   allow_failure: false
   variables:
-    NAME: almalinux-8
+    NAME: almalinux-9
 
 
 x86_64-alpine-319-container:

diff --git a/ci/manifest.yml b/ci/manifest.yml
index 84d31866fc9e679450ce6d6ce9f9a7c7443fc38e..ab1a2cff30405158e0d75b441072c5225fcc9785 100644 (file)
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -6,7 +6,7 @@ gitlab:
   project: libvirt
 
 targets:
-  almalinux-8:
+  almalinux-9:
     jobs:
       - arch: x86_64
         builds: false