mirror of https://github.com/xemu-project/xemu.git
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>
This commit is contained in:
parent
2355d18c79
commit
641b1efe01
|
@ -158,9 +158,9 @@ build-system-centos:
|
||||||
- .native_build_job_template
|
- .native_build_job_template
|
||||||
- .native_build_artifact_template
|
- .native_build_artifact_template
|
||||||
needs:
|
needs:
|
||||||
job: amd64-centos8-container
|
job: amd64-centos9-container
|
||||||
variables:
|
variables:
|
||||||
IMAGE: centos8
|
IMAGE: centos9
|
||||||
CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-vfio-user-server
|
CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-vfio-user-server
|
||||||
--enable-modules --enable-trace-backends=dtrace --enable-docs
|
--enable-modules --enable-trace-backends=dtrace --enable-docs
|
||||||
TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu
|
TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu
|
||||||
|
@ -242,7 +242,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:
|
||||||
|
@ -251,7 +251,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
|
||||||
AVOCADO_TAGS: arch:ppc64 arch:or1k arch:s390x arch:x86_64 arch:rx
|
AVOCADO_TAGS: arch:ppc64 arch:or1k arch:s390x arch:x86_64 arch:rx
|
||||||
arch:sh4
|
arch:sh4
|
||||||
|
@ -327,9 +327,9 @@ avocado-system-flaky:
|
||||||
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
|
||||||
|
@ -651,9 +651,9 @@ build-tci:
|
||||||
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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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 \
|
||||||
|
@ -42,7 +41,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 \
|
||||||
mtools \
|
mtools \
|
||||||
ncurses-devel \
|
ncurses-devel \
|
||||||
nettle-devel \
|
nettle-devel \
|
||||||
|
@ -95,25 +94,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 \
|
||||||
sed \
|
sed \
|
||||||
snappy-devel \
|
snappy-devel \
|
||||||
socat \
|
socat \
|
||||||
spice-protocol \
|
spice-protocol \
|
||||||
spice-server-devel \
|
|
||||||
swtpm \
|
swtpm \
|
||||||
systemd-devel \
|
systemd-devel \
|
||||||
systemtap-sdt-devel \
|
systemtap-sdt-devel \
|
||||||
tar \
|
tar \
|
||||||
usbredir-devel \
|
usbredir-devel \
|
||||||
util-linux \
|
util-linux \
|
||||||
virglrenderer-devel \
|
|
||||||
vte291-devel \
|
vte291-devel \
|
||||||
which \
|
which \
|
||||||
xfsprogs-devel \
|
xfsprogs-devel \
|
||||||
|
@ -132,18 +131,11 @@ 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 \
|
|
||||||
tomli
|
|
||||||
|
|
||||||
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"
|
||||||
# As a final step configure the user (if env is defined)
|
# As a final step configure the user (if env is defined)
|
||||||
ARG USER
|
ARG USER
|
||||||
ARG UID
|
ARG UID
|
|
@ -1,66 +1,50 @@
|
||||||
mappings:
|
mappings:
|
||||||
flake8:
|
flake8:
|
||||||
CentOSStream8:
|
|
||||||
OpenSUSELeap15:
|
OpenSUSELeap15:
|
||||||
|
|
||||||
meson:
|
meson:
|
||||||
CentOSStream8:
|
|
||||||
OpenSUSELeap15:
|
OpenSUSELeap15:
|
||||||
|
|
||||||
python3:
|
python3:
|
||||||
CentOSStream8: python38
|
|
||||||
OpenSUSELeap15: python311-base
|
OpenSUSELeap15: python311-base
|
||||||
|
|
||||||
python3-PyYAML:
|
python3-PyYAML:
|
||||||
CentOSStream8: python38-PyYAML
|
|
||||||
OpenSUSELeap15:
|
OpenSUSELeap15:
|
||||||
|
|
||||||
python3-devel:
|
python3-devel:
|
||||||
CentOSStream8: python38-devel
|
|
||||||
OpenSUSELeap15: python311-devel
|
OpenSUSELeap15: python311-devel
|
||||||
|
|
||||||
python3-docutils:
|
python3-docutils:
|
||||||
CentOSStream8:
|
|
||||||
OpenSUSELeap15:
|
OpenSUSELeap15:
|
||||||
|
|
||||||
python3-numpy:
|
python3-numpy:
|
||||||
CentOSStream8: python38-numpy
|
|
||||||
OpenSUSELeap15:
|
OpenSUSELeap15:
|
||||||
|
|
||||||
python3-opencv:
|
python3-opencv:
|
||||||
CentOSStream8:
|
|
||||||
OpenSUSELeap15:
|
OpenSUSELeap15:
|
||||||
|
|
||||||
python3-pillow:
|
python3-pillow:
|
||||||
CentOSStream8:
|
|
||||||
OpenSUSELeap15:
|
OpenSUSELeap15:
|
||||||
|
|
||||||
python3-pip:
|
python3-pip:
|
||||||
CentOSStream8: python38-pip
|
|
||||||
OpenSUSELeap15: python311-pip
|
OpenSUSELeap15: python311-pip
|
||||||
|
|
||||||
python3-pillow:
|
python3-pillow:
|
||||||
CentOSStream8:
|
|
||||||
OpenSUSELeap15:
|
OpenSUSELeap15:
|
||||||
|
|
||||||
python3-selinux:
|
python3-selinux:
|
||||||
CentOSStream8:
|
|
||||||
OpenSUSELeap15:
|
OpenSUSELeap15:
|
||||||
|
|
||||||
python3-setuptools:
|
python3-setuptools:
|
||||||
CentOSStream8: python38-setuptools
|
|
||||||
OpenSUSELeap15: python311-setuptools
|
OpenSUSELeap15: python311-setuptools
|
||||||
|
|
||||||
python3-sphinx:
|
python3-sphinx:
|
||||||
CentOSStream8:
|
|
||||||
OpenSUSELeap15:
|
OpenSUSELeap15:
|
||||||
|
|
||||||
python3-sphinx-rtd-theme:
|
python3-sphinx-rtd-theme:
|
||||||
CentOSStream8:
|
|
||||||
OpenSUSELeap15:
|
OpenSUSELeap15:
|
||||||
|
|
||||||
python3-sqlite3:
|
python3-sqlite3:
|
||||||
CentOSStream8: python38
|
|
||||||
OpenSUSELeap15: python311
|
OpenSUSELeap15: python311
|
||||||
|
|
||||||
python3-tomli:
|
python3-tomli:
|
||||||
|
@ -69,15 +53,11 @@ mappings:
|
||||||
Fedora:
|
Fedora:
|
||||||
Debian12:
|
Debian12:
|
||||||
OpenSUSELeap15:
|
OpenSUSELeap15:
|
||||||
# Not available for Python 3.8
|
|
||||||
CentOSStream8:
|
|
||||||
|
|
||||||
python3-venv:
|
python3-venv:
|
||||||
CentOSStream8: python38
|
|
||||||
OpenSUSELeap15: python311-base
|
OpenSUSELeap15: python311-base
|
||||||
|
|
||||||
python3-wheel:
|
python3-wheel:
|
||||||
CentOSStream8: python38-wheel
|
|
||||||
OpenSUSELeap15: python311-pip
|
OpenSUSELeap15: python311-pip
|
||||||
|
|
||||||
pypi_mappings:
|
pypi_mappings:
|
||||||
|
|
|
@ -125,7 +125,7 @@ try:
|
||||||
# Standard native builds
|
# Standard native builds
|
||||||
#
|
#
|
||||||
generate_dockerfile("alpine", "alpine-318")
|
generate_dockerfile("alpine", "alpine-318")
|
||||||
generate_dockerfile("centos8", "centos-stream-8")
|
generate_dockerfile("centos9", "centos-stream-9")
|
||||||
generate_dockerfile("debian", "debian-12",
|
generate_dockerfile("debian", "debian-12",
|
||||||
trailer="".join(debian12_extras))
|
trailer="".join(debian12_extras))
|
||||||
generate_dockerfile("fedora", "fedora-38")
|
generate_dockerfile("fedora", "fedora-38")
|
||||||
|
|
|
@ -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):
|
||||||
|
|
Loading…
Reference in New Issue