mirror of https://gitee.com/openkylin/libvirt.git
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:
parent
3f5a1fa234
commit
24a3d3975f
|
@ -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:
|
||||
|
|
|
@ -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 \
|
|
@ -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 \
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -6,7 +6,7 @@ gitlab:
|
|||
project: libvirt
|
||||
|
||||
targets:
|
||||
almalinux-8:
|
||||
almalinux-9:
|
||||
jobs:
|
||||
- arch: x86_64
|
||||
builds: false
|
||||
|
|
Loading…
Reference in New Issue