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>
This commit is contained in:
Michal Privoznik 2024-05-03 19:52:58 +02:00
parent 3f5a1fa234
commit 24a3d3975f
6 changed files with 21 additions and 25 deletions

View File

@ -67,7 +67,7 @@ include:
website_job: website_job:
extends: .gitlab_native_build_job extends: .gitlab_native_build_job
needs: needs:
- job: x86_64-almalinux-8-container - job: x86_64-almalinux-9-container
optional: true optional: true
script: script:
- source ci/jobs.sh - source ci/jobs.sh
@ -83,8 +83,8 @@ website_job:
paths: paths:
- website - website
variables: variables:
NAME: almalinux-8 NAME: almalinux-9
TARGET_BASE_IMAGE: docker.io/library/almalinux:8 TARGET_BASE_IMAGE: docker.io/library/almalinux:9
# On push to master publish the website from 'website_job' via gitlab pages # On push to master publish the website from 'website_job' via gitlab pages
pages: pages:

View File

@ -7,8 +7,7 @@
function install_buildenv() { function install_buildenv() {
dnf update -y dnf update -y
dnf install 'dnf-command(config-manager)' -y dnf install 'dnf-command(config-manager)' -y
dnf config-manager --set-enabled -y powertools dnf config-manager --set-enabled -y crb
dnf install -y centos-release-advanced-virtualization
dnf install -y epel-release dnf install -y epel-release
dnf install -y \ dnf install -y \
audit-libs-devel \ audit-libs-devel \
@ -17,6 +16,7 @@ function install_buildenv() {
ca-certificates \ ca-certificates \
ccache \ ccache \
clang \ clang \
clang-devel \
cpp \ cpp \
cyrus-sasl-devel \ cyrus-sasl-devel \
device-mapper-devel \ device-mapper-devel \
@ -31,7 +31,6 @@ function install_buildenv() {
glib2-devel \ glib2-devel \
glibc-devel \ glibc-devel \
glibc-langpack-en \ glibc-langpack-en \
glusterfs-api-devel \
gnutls-devel \ gnutls-devel \
grep \ grep \
iproute \ iproute \
@ -61,13 +60,12 @@ function install_buildenv() {
lvm2 \ lvm2 \
make \ make \
meson \ meson \
netcf-devel \
nfs-utils \ nfs-utils \
ninja-build \ ninja-build \
numactl-devel \ numactl-devel \
numad \ numad \
parted-devel \ parted-devel \
perl \ perl-base \
pkgconfig \ pkgconfig \
polkit \ polkit \
python3 \ python3 \

View File

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

View File

@ -7,30 +7,30 @@
# Native build jobs # Native build jobs
x86_64-almalinux-8: x86_64-almalinux-9:
extends: .native_build_job extends: .native_build_job
needs: needs:
- job: x86_64-almalinux-8-container - job: x86_64-almalinux-9-container
optional: true optional: true
allow_failure: false allow_failure: false
variables: variables:
JOB_OPTIONAL: 1 JOB_OPTIONAL: 1
NAME: almalinux-8 NAME: almalinux-9
RPM: skip 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 extends: .native_build_job
needs: needs:
- job: x86_64-almalinux-8-container - job: x86_64-almalinux-9-container
optional: true optional: true
allow_failure: false allow_failure: false
variables: variables:
CC: clang CC: clang
NAME: almalinux-8 NAME: almalinux-9
RPM: skip RPM: skip
TARGET_BASE_IMAGE: docker.io/library/almalinux:8 TARGET_BASE_IMAGE: docker.io/library/almalinux:9
x86_64-alpine-319: x86_64-alpine-319:

View File

@ -7,11 +7,11 @@
# Native container jobs # Native container jobs
x86_64-almalinux-8-container: x86_64-almalinux-9-container:
extends: .container_job extends: .container_job
allow_failure: false allow_failure: false
variables: variables:
NAME: almalinux-8 NAME: almalinux-9
x86_64-alpine-319-container: x86_64-alpine-319-container:

View File

@ -6,7 +6,7 @@ gitlab:
project: libvirt project: libvirt
targets: targets:
almalinux-8: almalinux-9:
jobs: jobs:
- arch: x86_64 - arch: x86_64
builds: false builds: false