tests: Update our CI to use CentOS Stream 9 instead of 8

RHEL 9 (and thus also the derivatives) have been available since two
years now, so according to QEMU's support policy, we can drop the active
support for the previous major version 8 now.

Another reason for doing this is that Centos Stream 8 will go EOL soon:

https://blog.centos.org/2023/04/end-dates-are-coming-for-centos-stream-8-and-centos-linux-7/

  "After May 31, 2024, CentOS Stream 8 will be archived
   and no further updates will be provided."

Thus upgrade our CentOS Stream container to major version 9 now.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240418101056.302103-5-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
(cherry picked from commit 641b1efe01)
(Mjt: numerous merge conflicts due to many changes in testing framework)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Thomas Huth
2024-04-18 12:10:47 +02:00
committed by Michael Tokarev
parent c57fe3ac66
commit ece3cc28df
6 changed files with 26 additions and 50 deletions

View File

@@ -162,9 +162,9 @@ crash-test-fedora:
build-system-centos: build-system-centos:
extends: .native_build_job_template extends: .native_build_job_template
needs: needs:
job: amd64-centos8-container job: amd64-centos9-container
variables: variables:
IMAGE: centos8 IMAGE: centos9
CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-fdt=system CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-fdt=system
--enable-modules --enable-trace-backends=dtrace --enable-docs --enable-modules --enable-trace-backends=dtrace --enable-docs
--enable-vfio-user-server --enable-vfio-user-server
@@ -182,7 +182,7 @@ check-system-centos:
- job: build-system-centos - job: build-system-centos
artifacts: true artifacts: true
variables: variables:
IMAGE: centos8 IMAGE: centos9
MAKE_CHECK_ARGS: check MAKE_CHECK_ARGS: check
avocado-system-centos: avocado-system-centos:
@@ -191,7 +191,7 @@ avocado-system-centos:
- job: build-system-centos - job: build-system-centos
artifacts: true artifacts: true
variables: variables:
IMAGE: centos8 IMAGE: centos9
MAKE_CHECK_ARGS: check-avocado MAKE_CHECK_ARGS: check-avocado
build-system-opensuse: build-system-opensuse:
@@ -237,9 +237,9 @@ avocado-system-opensuse:
build-tcg-disabled: build-tcg-disabled:
extends: .native_build_job_template extends: .native_build_job_template
needs: needs:
job: amd64-centos8-container job: amd64-centos9-container
variables: variables:
IMAGE: centos8 IMAGE: centos9
script: script:
- mkdir build - mkdir build
- cd build - cd build
@@ -563,9 +563,9 @@ build-coroutine-sigaltstack:
build-without-defaults: build-without-defaults:
extends: .native_build_job_template extends: .native_build_job_template
needs: needs:
job: amd64-centos8-container job: amd64-centos9-container
variables: variables:
IMAGE: centos8 IMAGE: centos9
CONFIGURE_ARGS: CONFIGURE_ARGS:
--without-default-devices --without-default-devices
--without-default-features --without-default-features

View File

@@ -1,10 +1,10 @@
include: include:
- local: '/.gitlab-ci.d/container-template.yml' - local: '/.gitlab-ci.d/container-template.yml'
amd64-centos8-container: amd64-centos9-container:
extends: .container_job_template extends: .container_job_template
variables: variables:
NAME: centos8 NAME: centos9
amd64-fedora-container: amd64-fedora-container:
extends: .container_job_template extends: .container_job_template

View File

@@ -1,15 +1,14 @@
# THIS FILE WAS AUTO-GENERATED # THIS FILE WAS AUTO-GENERATED
# #
# $ lcitool dockerfile --layers all centos-stream-8 qemu # $ lcitool dockerfile --layers all centos-stream-9 qemu
# #
# https://gitlab.com/libvirt/libvirt-ci # https://gitlab.com/libvirt/libvirt-ci
FROM quay.io/centos/centos:stream8 FROM quay.io/centos/centos:stream9
RUN dnf distro-sync -y && \ RUN dnf distro-sync -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 epel-next-release && \ dnf install -y epel-next-release && \
dnf install -y \ dnf install -y \
@@ -43,7 +42,6 @@ RUN dnf distro-sync -y && \
glib2-static \ glib2-static \
glibc-langpack-en \ glibc-langpack-en \
glibc-static \ glibc-static \
glusterfs-api-devel \
gnutls-devel \ gnutls-devel \
gtk3-devel \ gtk3-devel \
hostname \ hostname \
@@ -82,6 +80,7 @@ RUN dnf distro-sync -y && \
lzo-devel \ lzo-devel \
make \ make \
mesa-libgbm-devel \ mesa-libgbm-devel \
meson \
ncurses-devel \ ncurses-devel \
nettle-devel \ nettle-devel \
ninja-build \ ninja-build \
@@ -94,25 +93,25 @@ RUN dnf distro-sync -y && \
pixman-devel \ pixman-devel \
pkgconfig \ pkgconfig \
pulseaudio-libs-devel \ pulseaudio-libs-devel \
python38 \ python3 \
python38-PyYAML \ python3-PyYAML \
python38-numpy \ python3-numpy \
python38-pip \ python3-pillow \
python38-setuptools \ python3-pip \
python38-wheel \ python3-sphinx \
python3-sphinx_rtd_theme \
python3-tomli \
rdma-core-devel \ rdma-core-devel \
rpm \ rpm \
sed \ sed \
snappy-devel \ snappy-devel \
spice-protocol \ spice-protocol \
spice-server-devel \
systemd-devel \ systemd-devel \
systemtap-sdt-devel \ systemtap-sdt-devel \
tar \ tar \
texinfo \ texinfo \
usbredir-devel \ usbredir-devel \
util-linux \ util-linux \
virglrenderer-devel \
vte291-devel \ vte291-devel \
which \ which \
xfsprogs-devel \ xfsprogs-devel \
@@ -128,14 +127,8 @@ RUN dnf distro-sync -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
RUN /usr/bin/pip3.8 install \
meson==0.63.2 \
pillow \
sphinx \
sphinx-rtd-theme
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8" ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make" ENV MAKE "/usr/bin/make"
ENV NINJA "/usr/bin/ninja" ENV NINJA "/usr/bin/ninja"
ENV PYTHON "/usr/bin/python3.8" ENV PYTHON "/usr/bin/python3"

View File

@@ -1,70 +1,53 @@
mappings: mappings:
flake8: flake8:
CentOSStream8:
OpenSUSELeap153: OpenSUSELeap153:
meson: meson:
CentOSStream8:
OpenSUSELeap153: OpenSUSELeap153:
python3: python3:
CentOSStream8: python38
OpenSUSELeap153: python39-base OpenSUSELeap153: python39-base
python3-PyYAML: python3-PyYAML:
CentOSStream8: python38-PyYAML
OpenSUSELeap153: OpenSUSELeap153:
python3-devel: python3-devel:
CentOSStream8: python38-devel
OpenSUSELeap153: python39-devel OpenSUSELeap153: python39-devel
python3-docutils: python3-docutils:
CentOSStream8:
OpenSUSELeap153: OpenSUSELeap153:
python3-numpy: python3-numpy:
CentOSStream8: python38-numpy
OpenSUSELeap153: OpenSUSELeap153:
python3-opencv: python3-opencv:
CentOSStream8:
OpenSUSELeap153: OpenSUSELeap153:
python3-pillow: python3-pillow:
CentOSStream8:
OpenSUSELeap153: OpenSUSELeap153:
python3-pip: python3-pip:
CentOSStream8: python38-pip
OpenSUSELeap153: python39-pip OpenSUSELeap153: python39-pip
python3-pillow: python3-pillow:
CentOSStream8:
OpenSUSELeap153: OpenSUSELeap153:
python3-selinux: python3-selinux:
CentOSStream8:
OpenSUSELeap153: OpenSUSELeap153:
python3-setuptools: python3-setuptools:
CentOSStream8: python38-setuptools
OpenSUSELeap153: python39-setuptools OpenSUSELeap153: python39-setuptools
python3-sphinx: python3-sphinx:
CentOSStream8:
OpenSUSELeap153: OpenSUSELeap153:
python3-sphinx-rtd-theme: python3-sphinx-rtd-theme:
CentOSStream8:
OpenSUSELeap153: OpenSUSELeap153:
python3-venv: python3-venv:
CentOSStream8: python38
OpenSUSELeap153: python39-base OpenSUSELeap153: python39-base
python3-wheel: python3-wheel:
CentOSStream8: python38-wheel
OpenSUSELeap153: python39-pip OpenSUSELeap153: python39-pip
pypi_mappings: pypi_mappings:

View File

@@ -108,7 +108,7 @@ try:
# Standard native builds # Standard native builds
# #
generate_dockerfile("alpine", "alpine-316") generate_dockerfile("alpine", "alpine-316")
generate_dockerfile("centos8", "centos-stream-8") generate_dockerfile("centos9", "centos-stream-9")
generate_dockerfile("debian-amd64", "debian-11", generate_dockerfile("debian-amd64", "debian-11",
trailer="".join(debian11_extras)) trailer="".join(debian11_extras))
generate_dockerfile("fedora", "fedora-37") generate_dockerfile("fedora", "fedora-37")

View File

@@ -26,8 +26,8 @@ class CentosVM(basevm.BaseVM):
export SRC_ARCHIVE=/dev/vdb; export SRC_ARCHIVE=/dev/vdb;
sudo chmod a+r $SRC_ARCHIVE; sudo chmod a+r $SRC_ARCHIVE;
tar -xf $SRC_ARCHIVE; tar -xf $SRC_ARCHIVE;
make docker-test-block@centos8 {verbose} J={jobs} NETWORK=1; make docker-test-block@centos9 {verbose} J={jobs} NETWORK=1;
make docker-test-quick@centos8 {verbose} J={jobs} NETWORK=1; make docker-test-quick@centos9 {verbose} J={jobs} NETWORK=1;
""" """
def build_image(self, img): def build_image(self, img):