shaba/libvirt-python
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt-python.git synced 2024-10-26 07:55:06 +03:00
Code Issues Projects Releases Activity

ci: Drop CentOS 8 Stream and switch F38 to 40, Ubuntu 20.04 to 22.04

Browse Source 
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 <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2024-05-02 15:24:38 +02:00
parent 858fe08d73
commit ee54658eb5
10 changed files with 48 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitlab-ci.yml
View File

@ -55,24 +55,6 @@ stages:
mv rpmbuild/RPMS/x86_64/ libvirt-python-rpms ;
fi
.native_setuppy_build_job:
extends:
- .gitlab_native_build_job
script:
- export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
- export CFLAGS="-Werror"
- $PYTHON setup.py bdist_wheel
- $PYTHON setup.py sdist
- $PYTHON -m venv test-venv --system-site-packages --symlinks
- test-venv/bin/python -m pip install dist/libvirt_python*.whl
- test-venv/bin/python -m pytest tests
- if test -x /usr/bin/rpmbuild && test "$RPM" != "skip" ;
then
unset CFLAGS ;
rpmbuild --clean --nodeps --define "_topdir $PWD/rpmbuild" -ta dist/libvirt-python*tar.gz ;
mv rpmbuild/RPMS/x86_64/ libvirt-python-rpms ;
fi
include: '/ci/gitlab.yml'
api_coverage_job:

40
ci/buildenv/centos-stream-8.sh
View File

@ -1,40 +0,0 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool manifest ci/manifest.yml
#
# https://gitlab.com/libvirt/libvirt-ci
function install_buildenv() {
dnf distro-sync -y
dnf install 'dnf-command(config-manager)' -y
dnf config-manager --set-enabled -y powertools
dnf install -y centos-release-advanced-virtualization
dnf install -y epel-release
dnf install -y epel-next-release
dnf install -y \
ca-certificates \
ccache \
gcc \
git \
glibc-langpack-en \
libvirt-devel \
pkgconfig \
python3 \
python3-devel \
python3-lxml \
python3-pip \
python3-pytest \
python3-setuptools \
python3-wheel \
rpm-build
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
rpm -qa | sort > /packages.txt
mkdir -p /usr/libexec/ccache-wrappers
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
/usr/bin/pip3 install build
}
export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"
export LANG="en_US.UTF-8"
export PYTHON="/usr/bin/python3"

0
ci/buildenv/fedora-38.sh → ci/buildenv/fedora-40.sh
View File

2
ci/buildenv/ubuntu-2004.sh → ci/buildenv/ubuntu-2404.sh
View File

@ -17,6 +17,7 @@ function install_buildenv() {
locales \
pkgconf \
python3 \
python3-build \
python3-dev \
python3-lxml \
python3-pip \
@ -31,7 +32,6 @@ function install_buildenv() {
mkdir -p /usr/libexec/ccache-wrappers
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
/usr/bin/pip3 install build
}
export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"

43
ci/containers/centos-stream-8.Dockerfile
View File

@ -1,43 +0,0 @@
# THIS FILE WAS AUTO-GENERATED
#
# $ lcitool manifest ci/manifest.yml
#
# https://gitlab.com/libvirt/libvirt-ci
FROM quay.io/centos/centos:stream8
RUN dnf distro-sync -y && \
dnf install 'dnf-command(config-manager)' -y && \
dnf config-manager --set-enabled -y powertools && \
dnf install -y centos-release-advanced-virtualization && \
dnf install -y epel-release && \
dnf install -y epel-next-release && \
dnf install -y \
ca-certificates \
ccache \
gcc \
git \
glibc-langpack-en \
libvirt-devel \
pkgconfig \
python3 \
python3-devel \
python3-lxml \
python3-pip \
python3-pytest \
python3-setuptools \
python3-wheel \
rpm-build && \
dnf autoremove -y && \
dnf clean all -y && \
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
rpm -qa | sort > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
RUN /usr/bin/pip3 install build
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV PYTHON "/usr/bin/python3"

2
ci/containers/fedora-38.Dockerfile → ci/containers/fedora-40.Dockerfile
View File

@ -4,7 +4,7 @@
#
# https://gitlab.com/libvirt/libvirt-ci
FROM registry.fedoraproject.org/fedora:38
FROM registry.fedoraproject.org/fedora:40
RUN dnf install -y nosync && \
printf '#!/bin/sh\n\

5
ci/containers/ubuntu-2004.Dockerfile → ci/containers/ubuntu-2404.Dockerfile
View File

@ -4,7 +4,7 @@
#
# https://gitlab.com/libvirt/libvirt-ci
FROM docker.io/library/ubuntu:20.04
FROM docker.io/library/ubuntu:24.04
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@ -19,6 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
locales \
pkgconf \
python3 \
python3-build \
python3-dev \
python3-lxml \
python3-pip \
@ -36,8 +37,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
RUN /usr/bin/pip3 install build
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV PYTHON "/usr/bin/python3"

67
ci/gitlab/builds.yml
View File

@ -7,21 +7,6 @@
# Native build jobs
x86_64-centos-stream-8:
extends: .native_setuppy_build_job
needs:
- job: x86_64-centos-stream-8-container
optional: true
allow_failure: false
variables:
NAME: centos-stream-8
TARGET_BASE_IMAGE: quay.io/centos/centos:stream8
artifacts:
expire_in: 1 hour
paths:
- libvirt-python-rpms
x86_64-centos-stream-9:
extends: .native_build_job
needs:
@ -75,21 +60,6 @@ x86_64-debian-sid:
TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim
x86_64-fedora-38:
extends: .native_build_job
needs:
- job: x86_64-fedora-38-container
optional: true
allow_failure: false
variables:
NAME: fedora-38
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:38
artifacts:
expire_in: 1 hour
paths:
- libvirt-python-rpms
x86_64-fedora-39:
extends: .native_build_job
needs:
@ -105,6 +75,21 @@ x86_64-fedora-39:
- libvirt-python-rpms
x86_64-fedora-40:
extends: .native_build_job
needs:
- job: x86_64-fedora-40-container
optional: true
allow_failure: false
variables:
NAME: fedora-40
TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40
artifacts:
expire_in: 1 hour
paths:
- libvirt-python-rpms
x86_64-fedora-rawhide:
extends: .native_build_job
needs:
@ -140,17 +125,6 @@ x86_64-opensuse-tumbleweed:
TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/tumbleweed:latest
x86_64-ubuntu-2004:
extends: .native_build_job
needs:
- job: x86_64-ubuntu-2004-container
optional: true
allow_failure: false
variables:
NAME: ubuntu-2004
TARGET_BASE_IMAGE: docker.io/library/ubuntu:20.04
x86_64-ubuntu-2204:
extends: .native_build_job
needs:
@ -160,3 +134,14 @@ x86_64-ubuntu-2204:
variables:
NAME: ubuntu-2204
TARGET_BASE_IMAGE: docker.io/library/ubuntu:22.04
x86_64-ubuntu-2404:
extends: .native_build_job
needs:
- job: x86_64-ubuntu-2404-container
optional: true
allow_failure: false
variables:
NAME: ubuntu-2404
TARGET_BASE_IMAGE: docker.io/library/ubuntu:24.04

35
ci/gitlab/containers.yml
View File

@ -7,13 +7,6 @@
# Native container jobs
x86_64-centos-stream-8-container:
extends: .container_job
allow_failure: false
variables:
NAME: centos-stream-8
x86_64-centos-stream-9-container:
extends: .container_job
allow_failure: false
@ -35,13 +28,6 @@ x86_64-debian-sid-container:
NAME: debian-sid
x86_64-fedora-38-container:
extends: .container_job
allow_failure: false
variables:
NAME: fedora-38
x86_64-fedora-39-container:
extends: .container_job
allow_failure: false
@ -49,6 +35,13 @@ x86_64-fedora-39-container:
NAME: fedora-39
x86_64-fedora-40-container:
extends: .container_job
allow_failure: false
variables:
NAME: fedora-40
x86_64-fedora-rawhide-container:
extends: .container_job
allow_failure: true
@ -70,15 +63,15 @@ x86_64-opensuse-tumbleweed-container:
NAME: opensuse-tumbleweed
x86_64-ubuntu-2004-container:
extends: .container_job
allow_failure: false
variables:
NAME: ubuntu-2004
x86_64-ubuntu-2204-container:
extends: .container_job
allow_failure: false
variables:
NAME: ubuntu-2204
x86_64-ubuntu-2404-container:
extends: .container_job
allow_failure: false
variables:
NAME: ubuntu-2404

17
ci/manifest.yml
View File

@ -8,15 +8,6 @@ gitlab:
targets:
centos-stream-8:
jobs:
- arch: x86_64
template: .native_setuppy_build_job
artifacts:
expire_in: 1 hour
paths:
- libvirt-python-rpms
centos-stream-9:
projects:
- libvirt-python
@ -47,7 +38,7 @@ targets:
- arch: x86_64
allow-failure: true
fedora-38:
fedora-39:
jobs:
- arch: x86_64
artifacts:
@ -55,7 +46,7 @@ targets:
paths:
- libvirt-python-rpms
fedora-39:
fedora-40:
jobs:
- arch: x86_64
artifacts:
@ -81,6 +72,6 @@ targets:
variables:
RPM: skip
ubuntu-2004: x86_64
ubuntu-2204: x86_64
ubuntu-2404: x86_64