Skip to content

Commit 641b1ef

Browse files
huthhuth
committed
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é <[email protected]> Message-ID: <[email protected]> Signed-off-by: Thomas Huth <[email protected]>
1 parent 2355d18 commit 641b1ef

File tree

6 files changed

+26
-54
lines changed

6 files changed

+26
-54
lines changed

‎.gitlab-ci.d/buildtest.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ build-system-centos:
158158
- .native_build_job_template
159159
- .native_build_artifact_template
160160
needs:
161-
job: amd64-centos8-container
161+
job: amd64-centos9-container
162162
variables:
163-
IMAGE: centos8
163+
IMAGE: centos9
164164
CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-vfio-user-server
165165
--enable-modules --enable-trace-backends=dtrace --enable-docs
166166
TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu
@@ -242,7 +242,7 @@ check-system-centos:
242242
- job: build-system-centos
243243
artifacts: true
244244
variables:
245-
IMAGE: centos8
245+
IMAGE: centos9
246246
MAKE_CHECK_ARGS: check
247247

248248
avocado-system-centos:
@@ -251,7 +251,7 @@ avocado-system-centos:
251251
- job: build-system-centos
252252
artifacts: true
253253
variables:
254-
IMAGE: centos8
254+
IMAGE: centos9
255255
MAKE_CHECK_ARGS: check-avocado
256256
AVOCADO_TAGS: arch:ppc64 arch:or1k arch:s390x arch:x86_64 arch:rx
257257
arch:sh4
@@ -327,9 +327,9 @@ avocado-system-flaky:
327327
build-tcg-disabled:
328328
extends: .native_build_job_template
329329
needs:
330-
job: amd64-centos8-container
330+
job: amd64-centos9-container
331331
variables:
332-
IMAGE: centos8
332+
IMAGE: centos9
333333
script:
334334
- mkdir build
335335
- cd build
@@ -651,9 +651,9 @@ build-tci:
651651
build-without-defaults:
652652
extends: .native_build_job_template
653653
needs:
654-
job: amd64-centos8-container
654+
job: amd64-centos9-container
655655
variables:
656-
IMAGE: centos8
656+
IMAGE: centos9
657657
CONFIGURE_ARGS:
658658
--without-default-devices
659659
--without-default-features

‎.gitlab-ci.d/container-core.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
include:
22
- local: '/.gitlab-ci.d/container-template.yml'
33

4-
amd64-centos8-container:
4+
amd64-centos9-container:
55
extends: .container_job_template
66
variables:
7-
NAME: centos8
7+
NAME: centos9
88

99
amd64-fedora-container:
1010
extends: .container_job_template

‎tests/docker/dockerfiles/centos8.docker ‎tests/docker/dockerfiles/centos9.docker

+13-21
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
# THIS FILE WAS AUTO-GENERATED
22
#
3-
# $ lcitool dockerfile --layers all centos-stream-8 qemu
3+
# $ lcitool dockerfile --layers all centos-stream-9 qemu
44
#
55
# https://gitlab.com/libvirt/libvirt-ci
66

7-
FROM quay.io/centos/centos:stream8
7+
FROM quay.io/centos/centos:stream9
88

99
RUN dnf distro-sync -y && \
1010
dnf install 'dnf-command(config-manager)' -y && \
11-
dnf config-manager --set-enabled -y powertools && \
12-
dnf install -y centos-release-advanced-virtualization && \
11+
dnf config-manager --set-enabled -y crb && \
1312
dnf install -y epel-release && \
1413
dnf install -y epel-next-release && \
1514
dnf install -y \
@@ -42,7 +41,6 @@ RUN dnf distro-sync -y && \
4241
glib2-static \
4342
glibc-langpack-en \
4443
glibc-static \
45-
glusterfs-api-devel \
4644
gnutls-devel \
4745
gtk3-devel \
4846
hostname \
@@ -82,6 +80,7 @@ RUN dnf distro-sync -y && \
8280
lzo-devel \
8381
make \
8482
mesa-libgbm-devel \
83+
meson \
8584
mtools \
8685
ncurses-devel \
8786
nettle-devel \
@@ -95,25 +94,25 @@ RUN dnf distro-sync -y && \
9594
pixman-devel \
9695
pkgconfig \
9796
pulseaudio-libs-devel \
98-
python38 \
99-
python38-PyYAML \
100-
python38-numpy \
101-
python38-pip \
102-
python38-setuptools \
103-
python38-wheel \
97+
python3 \
98+
python3-PyYAML \
99+
python3-numpy \
100+
python3-pillow \
101+
python3-pip \
102+
python3-sphinx \
103+
python3-sphinx_rtd_theme \
104+
python3-tomli \
104105
rdma-core-devel \
105106
sed \
106107
snappy-devel \
107108
socat \
108109
spice-protocol \
109-
spice-server-devel \
110110
swtpm \
111111
systemd-devel \
112112
systemtap-sdt-devel \
113113
tar \
114114
usbredir-devel \
115115
util-linux \
116-
virglrenderer-devel \
117116
vte291-devel \
118117
which \
119118
xfsprogs-devel \
@@ -132,18 +131,11 @@ RUN dnf distro-sync -y && \
132131
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \
133132
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
134133

135-
RUN /usr/bin/pip3.8 install \
136-
meson==0.63.2 \
137-
pillow \
138-
sphinx \
139-
sphinx-rtd-theme \
140-
tomli
141-
142134
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
143135
ENV LANG "en_US.UTF-8"
144136
ENV MAKE "/usr/bin/make"
145137
ENV NINJA "/usr/bin/ninja"
146-
ENV PYTHON "/usr/bin/python3.8"
138+
ENV PYTHON "/usr/bin/python3"
147139
# As a final step configure the user (if env is defined)
148140
ARG USER
149141
ARG UID

‎tests/lcitool/mappings.yml

-20
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,50 @@
11
mappings:
22
flake8:
3-
CentOSStream8:
43
OpenSUSELeap15:
54

65
meson:
7-
CentOSStream8:
86
OpenSUSELeap15:
97

108
python3:
11-
CentOSStream8: python38
129
OpenSUSELeap15: python311-base
1310

1411
python3-PyYAML:
15-
CentOSStream8: python38-PyYAML
1612
OpenSUSELeap15:
1713

1814
python3-devel:
19-
CentOSStream8: python38-devel
2015
OpenSUSELeap15: python311-devel
2116

2217
python3-docutils:
23-
CentOSStream8:
2418
OpenSUSELeap15:
2519

2620
python3-numpy:
27-
CentOSStream8: python38-numpy
2821
OpenSUSELeap15:
2922

3023
python3-opencv:
31-
CentOSStream8:
3224
OpenSUSELeap15:
3325

3426
python3-pillow:
35-
CentOSStream8:
3627
OpenSUSELeap15:
3728

3829
python3-pip:
39-
CentOSStream8: python38-pip
4030
OpenSUSELeap15: python311-pip
4131

4232
python3-pillow:
43-
CentOSStream8:
4433
OpenSUSELeap15:
4534

4635
python3-selinux:
47-
CentOSStream8:
4836
OpenSUSELeap15:
4937

5038
python3-setuptools:
51-
CentOSStream8: python38-setuptools
5239
OpenSUSELeap15: python311-setuptools
5340

5441
python3-sphinx:
55-
CentOSStream8:
5642
OpenSUSELeap15:
5743

5844
python3-sphinx-rtd-theme:
59-
CentOSStream8:
6045
OpenSUSELeap15:
6146

6247
python3-sqlite3:
63-
CentOSStream8: python38
6448
OpenSUSELeap15: python311
6549

6650
python3-tomli:
@@ -69,15 +53,11 @@ mappings:
6953
Fedora:
7054
Debian12:
7155
OpenSUSELeap15:
72-
# Not available for Python 3.8
73-
CentOSStream8:
7456

7557
python3-venv:
76-
CentOSStream8: python38
7758
OpenSUSELeap15: python311-base
7859

7960
python3-wheel:
80-
CentOSStream8: python38-wheel
8161
OpenSUSELeap15: python311-pip
8262

8363
pypi_mappings:

‎tests/lcitool/refresh

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ try:
125125
# Standard native builds
126126
#
127127
generate_dockerfile("alpine", "alpine-318")
128-
generate_dockerfile("centos8", "centos-stream-8")
128+
generate_dockerfile("centos9", "centos-stream-9")
129129
generate_dockerfile("debian", "debian-12",
130130
trailer="".join(debian12_extras))
131131
generate_dockerfile("fedora", "fedora-38")

‎tests/vm/centos

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ class CentosVM(basevm.BaseVM):
2626
export SRC_ARCHIVE=/dev/vdb;
2727
sudo chmod a+r $SRC_ARCHIVE;
2828
tar -xf $SRC_ARCHIVE;
29-
make docker-test-block@centos8 {verbose} J={jobs} NETWORK=1;
30-
make docker-test-quick@centos8 {verbose} J={jobs} NETWORK=1;
29+
make docker-test-block@centos9 {verbose} J={jobs} NETWORK=1;
30+
make docker-test-quick@centos9 {verbose} J={jobs} NETWORK=1;
3131
"""
3232

3333
def build_image(self, img):

0 commit comments

Comments
 (0)