Skip to content

Commit ee54658

Browse files
committed
ci: Drop CentOS 8 Stream and switch F38 to 40, Ubuntu 20.04 to 22.04
There a lot happening here, but that's because otherwise lcitool fails to regenerate files. Firstly, CentOS 8 is dropped as it's unsupported now. Secondly, Fedora 40 is introduced and Fedora 38 is dropped. And lastly, Ubuntu 24.04 is introduced and Ubuntu 20.04 is dropped. Signed-off-by: Michal Privoznik <[email protected]>
1 parent 858fe08 commit ee54658

10 files changed

+32
-165
lines changed

Diff for: .gitlab-ci.yml

-18
Original file line numberDiff line numberDiff line change
@@ -55,24 +55,6 @@ stages:
5555
mv rpmbuild/RPMS/x86_64/ libvirt-python-rpms ;
5656
fi
5757

58-
.native_setuppy_build_job:
59-
extends:
60-
- .gitlab_native_build_job
61-
script:
62-
- export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
63-
- export CFLAGS="-Werror"
64-
- $PYTHON setup.py bdist_wheel
65-
- $PYTHON setup.py sdist
66-
- $PYTHON -m venv test-venv --system-site-packages --symlinks
67-
- test-venv/bin/python -m pip install dist/libvirt_python*.whl
68-
- test-venv/bin/python -m pytest tests
69-
- if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ;
70-
then
71-
unset CFLAGS ;
72-
rpmbuild --clean --nodeps --define "_topdir $PWD/rpmbuild" -ta dist/libvirt-python*tar.gz ;
73-
mv rpmbuild/RPMS/x86_64/ libvirt-python-rpms ;
74-
fi
75-
7658
include: '/ci/gitlab.yml'
7759

7860
api_coverage_job:

Diff for: ci/buildenv/centos-stream-8.sh

-40
This file was deleted.
File renamed without changes.

Diff for: ci/buildenv/ubuntu-2004.sh renamed to ci/buildenv/ubuntu-2404.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ function install_buildenv() {
1717
locales \
1818
pkgconf \
1919
python3 \
20+
python3-build \
2021
python3-dev \
2122
python3-lxml \
2223
python3-pip \
@@ -31,7 +32,6 @@ function install_buildenv() {
3132
mkdir -p /usr/libexec/ccache-wrappers
3233
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
3334
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
34-
/usr/bin/pip3 install build
3535
}
3636

3737
export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"

Diff for: ci/containers/centos-stream-8.Dockerfile

-43
This file was deleted.

Diff for: ci/containers/fedora-38.Dockerfile renamed to ci/containers/fedora-40.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# https://gitlab.com/libvirt/libvirt-ci
66

7-
FROM registry.fedoraproject.org/fedora:38
7+
FROM registry.fedoraproject.org/fedora:40
88

99
RUN dnf install -y nosync && \
1010
printf '#!/bin/sh\n\

Diff for: ci/containers/ubuntu-2004.Dockerfile renamed to ci/containers/ubuntu-2404.Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# https://gitlab.com/libvirt/libvirt-ci
66

7-
FROM docker.io/library/ubuntu:20.04
7+
FROM docker.io/library/ubuntu:24.04
88

99
RUN export DEBIAN_FRONTEND=noninteractive && \
1010
apt-get update && \
@@ -19,6 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
1919
locales \
2020
pkgconf \
2121
python3 \
22+
python3-build \
2223
python3-dev \
2324
python3-lxml \
2425
python3-pip \
@@ -36,8 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
3637
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
3738
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
3839

39-
RUN /usr/bin/pip3 install build
40-
4140
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
4241
ENV LANG "en_US.UTF-8"
4342
ENV PYTHON "/usr/bin/python3"

Diff for: ci/gitlab/builds.yml

+16-31
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,6 @@
77

88
# Native build jobs
99

10-
x86_64-centos-stream-8:
11-
extends: .native_setuppy_build_job
12-
needs:
13-
- job: x86_64-centos-stream-8-container
14-
optional: true
15-
allow_failure: false
16-
variables:
17-
NAME: centos-stream-8
18-
TARGET_BASE_IMAGE: quay.io/centos/centos:stream8
19-
artifacts:
20-
expire_in: 1 hour
21-
paths:
22-
- libvirt-python-rpms
23-
24-
2510
x86_64-centos-stream-9:
2611
extends: .native_build_job
2712
needs:
@@ -75,30 +60,30 @@ x86_64-debian-sid:
7560
TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
7661

7762

78-
x86_64-fedora-38:
63+
x86_64-fedora-39:
7964
extends: .native_build_job
8065
needs:
81-
- job: x86_64-fedora-38-container
66+
- job: x86_64-fedora-39-container
8267
optional: true
8368
allow_failure: false
8469
variables:
85-
NAME: fedora-38
86-
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:38
70+
NAME: fedora-39
71+
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:39
8772
artifacts:
8873
expire_in: 1 hour
8974
paths:
9075
- libvirt-python-rpms
9176

9277

93-
x86_64-fedora-39:
78+
x86_64-fedora-40:
9479
extends: .native_build_job
9580
needs:
96-
- job: x86_64-fedora-39-container
81+
- job: x86_64-fedora-40-container
9782
optional: true
9883
allow_failure: false
9984
variables:
100-
NAME: fedora-39
101-
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:39
85+
NAME: fedora-40
86+
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
10287
artifacts:
10388
expire_in: 1 hour
10489
paths:
@@ -140,23 +125,23 @@ x86_64-opensuse-tumbleweed:
140125
TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/tumbleweed:latest
141126

142127

143-
x86_64-ubuntu-2004:
128+
x86_64-ubuntu-2204:
144129
extends: .native_build_job
145130
needs:
146-
- job: x86_64-ubuntu-2004-container
131+
- job: x86_64-ubuntu-2204-container
147132
optional: true
148133
allow_failure: false
149134
variables:
150-
NAME: ubuntu-2004
151-
TARGET_BASE_IMAGE: docker.io/library/ubuntu:20.04
135+
NAME: ubuntu-2204
136+
TARGET_BASE_IMAGE: docker.io/library/ubuntu:22.04
152137

153138

154-
x86_64-ubuntu-2204:
139+
x86_64-ubuntu-2404:
155140
extends: .native_build_job
156141
needs:
157-
- job: x86_64-ubuntu-2204-container
142+
- job: x86_64-ubuntu-2404-container
158143
optional: true
159144
allow_failure: false
160145
variables:
161-
NAME: ubuntu-2204
162-
TARGET_BASE_IMAGE: docker.io/library/ubuntu:22.04
146+
NAME: ubuntu-2404
147+
TARGET_BASE_IMAGE: docker.io/library/ubuntu:24.04

Diff for: ci/gitlab/containers.yml

+8-15
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@
77

88
# Native container jobs
99

10-
x86_64-centos-stream-8-container:
11-
extends: .container_job
12-
allow_failure: false
13-
variables:
14-
NAME: centos-stream-8
15-
16-
1710
x86_64-centos-stream-9-container:
1811
extends: .container_job
1912
allow_failure: false
@@ -35,18 +28,18 @@ x86_64-debian-sid-container:
3528
NAME: debian-sid
3629

3730

38-
x86_64-fedora-38-container:
31+
x86_64-fedora-39-container:
3932
extends: .container_job
4033
allow_failure: false
4134
variables:
42-
NAME: fedora-38
35+
NAME: fedora-39
4336

4437

45-
x86_64-fedora-39-container:
38+
x86_64-fedora-40-container:
4639
extends: .container_job
4740
allow_failure: false
4841
variables:
49-
NAME: fedora-39
42+
NAME: fedora-40
5043

5144

5245
x86_64-fedora-rawhide-container:
@@ -70,15 +63,15 @@ x86_64-opensuse-tumbleweed-container:
7063
NAME: opensuse-tumbleweed
7164

7265

73-
x86_64-ubuntu-2004-container:
66+
x86_64-ubuntu-2204-container:
7467
extends: .container_job
7568
allow_failure: false
7669
variables:
77-
NAME: ubuntu-2004
70+
NAME: ubuntu-2204
7871

7972

80-
x86_64-ubuntu-2204-container:
73+
x86_64-ubuntu-2404-container:
8174
extends: .container_job
8275
allow_failure: false
8376
variables:
84-
NAME: ubuntu-2204
77+
NAME: ubuntu-2404

Diff for: ci/manifest.yml

+4-13
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,6 @@ gitlab:
88

99
targets:
1010

11-
centos-stream-8:
12-
jobs:
13-
- arch: x86_64
14-
template: .native_setuppy_build_job
15-
artifacts:
16-
expire_in: 1 hour
17-
paths:
18-
- libvirt-python-rpms
19-
2011
centos-stream-9:
2112
projects:
2213
- libvirt-python
@@ -47,15 +38,15 @@ targets:
4738
- arch: x86_64
4839
allow-failure: true
4940

50-
fedora-38:
41+
fedora-39:
5142
jobs:
5243
- arch: x86_64
5344
artifacts:
5445
expire_in: 1 hour
5546
paths:
5647
- libvirt-python-rpms
5748

58-
fedora-39:
49+
fedora-40:
5950
jobs:
6051
- arch: x86_64
6152
artifacts:
@@ -81,6 +72,6 @@ targets:
8172
variables:
8273
RPM: skip
8374

84-
ubuntu-2004: x86_64
85-
8675
ubuntu-2204: x86_64
76+
77+
ubuntu-2404: x86_64

0 commit comments

Comments
 (0)