[PATCH v2 06/10] 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(a)redhat.com&gt; Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- .gitlab-ci.yml | 6 +++--- ci/buildenv/{almalinux-8.sh => almalinux-9.sh} | 8 +++----- ...linux-8.Dockerfile => almalinux-9.Dockerfile} | 10 ++++------ ci/gitlab/builds.yml | 16 ++++++++-------- ci/gitlab/containers.yml | 4 ++-- ci/manifest.yml | 2 +- 6 files changed, 21 insertions(+), 25 deletions(-) rename ci/buildenv/{almalinux-8.sh => almalinux-9.sh} (93%) rename ci/containers/{almalinux-8.Dockerfile => almalinux-9.Dockerfile} (91%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b879b88f74..81ac2ecddd 100644 --- 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 a962576414..f0826e1313 100644 --- 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 af8a7b24d4..68608b12a9 100644 --- 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 1629e02525..6ed5c578dd 100644 --- 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 b7ae60b10a..c1e7a0a67e 100644 --- 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 84d31866fc..ab1a2cff30 100644 --- 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 -- 2.43.2