From 0974ca9326f57a6c30a117fd09c5c6e0700083e8 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 27 May 2025 14:00:37 +0200 Subject: [PATCH] ci: refresh with 'lcitool manifest' This drops Fedora 40 and introduces Fedora 42 and drops deprecated setting of env vars in dockerfiles. Signed-off-by: Michal Privoznik --- ci/buildenv/{fedora-40.sh => fedora-42.sh} | 0 ci/containers/centos-stream-9.Dockerfile | 10 +++++----- ci/containers/debian-12.Dockerfile | 6 +++--- ci/containers/debian-sid.Dockerfile | 6 +++--- ci/containers/fedora-41.Dockerfile | 6 +++--- .../{fedora-40.Dockerfile => fedora-42.Dockerfile} | 8 ++++---- ci/containers/fedora-rawhide.Dockerfile | 6 +++--- ci/containers/opensuse-leap-15.Dockerfile | 6 +++--- ci/containers/opensuse-tumbleweed.Dockerfile | 6 +++--- ci/containers/ubuntu-2204.Dockerfile | 6 +++--- ci/containers/ubuntu-2404.Dockerfile | 6 +++--- ci/gitlab/builds.yml | 16 ++++++++-------- ci/gitlab/containers.yml | 8 ++++---- ci/manifest.yml | 4 ++-- 14 files changed, 47 insertions(+), 47 deletions(-) rename ci/buildenv/{fedora-40.sh => fedora-42.sh} (100%) rename ci/containers/{fedora-40.Dockerfile => fedora-42.Dockerfile} (89%) diff --git a/ci/buildenv/fedora-40.sh b/ci/buildenv/fedora-42.sh similarity index 100% rename from ci/buildenv/fedora-40.sh rename to ci/buildenv/fedora-42.sh diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile index 533eb3a..11e62f0 100644 --- a/ci/containers/centos-stream-9.Dockerfile +++ b/ci/containers/centos-stream-9.Dockerfile @@ -51,8 +51,8 @@ RUN dnf distro-sync -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" +ENV MAKE="/usr/bin/make" +ENV NINJA="/usr/bin/ninja" +ENV PYTHON="/usr/bin/python3" diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile index a2d70a1..021a231 100644 --- a/ci/containers/debian-12.Dockerfile +++ b/ci/containers/debian-12.Dockerfile @@ -37,6 +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 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" +ENV PYTHON="/usr/bin/python3" diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index 3ef46f2..95f6e52 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -37,6 +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 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" +ENV PYTHON="/usr/bin/python3" diff --git a/ci/containers/fedora-41.Dockerfile b/ci/containers/fedora-41.Dockerfile index 743a80a..fcc9e36 100644 --- a/ci/containers/fedora-41.Dockerfile +++ b/ci/containers/fedora-41.Dockerfile @@ -42,6 +42,6 @@ exec "$@"\n' > /usr/bin/nosync && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" +ENV PYTHON="/usr/bin/python3" diff --git a/ci/containers/fedora-40.Dockerfile b/ci/containers/fedora-42.Dockerfile similarity index 89% rename from ci/containers/fedora-40.Dockerfile rename to ci/containers/fedora-42.Dockerfile index 095329f..2304da7 100644 --- a/ci/containers/fedora-40.Dockerfile +++ b/ci/containers/fedora-42.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:40 +FROM registry.fedoraproject.org/fedora:42 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -42,6 +42,6 @@ exec "$@"\n' > /usr/bin/nosync && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" +ENV PYTHON="/usr/bin/python3" diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 5f011d0..27ca385 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -43,6 +43,6 @@ exec "$@"\n' > /usr/bin/nosync && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" +ENV PYTHON="/usr/bin/python3" diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile index 5d6c13a..bfd2a36 100644 --- a/ci/containers/opensuse-leap-15.Dockerfile +++ b/ci/containers/opensuse-leap-15.Dockerfile @@ -33,6 +33,6 @@ RUN zypper update -y && \ RUN /usr/bin/pip3 install build -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" +ENV PYTHON="/usr/bin/python3" diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index 8ef1625..c85823b 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -31,6 +31,6 @@ RUN zypper dist-upgrade -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" +ENV PYTHON="/usr/bin/python3" diff --git a/ci/containers/ubuntu-2204.Dockerfile b/ci/containers/ubuntu-2204.Dockerfile index 3a1cfd9..46da1d7 100644 --- a/ci/containers/ubuntu-2204.Dockerfile +++ b/ci/containers/ubuntu-2204.Dockerfile @@ -38,6 +38,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ RUN /usr/bin/pip3 install build -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" +ENV PYTHON="/usr/bin/python3" diff --git a/ci/containers/ubuntu-2404.Dockerfile b/ci/containers/ubuntu-2404.Dockerfile index aa0fb65..c8bd00c 100644 --- a/ci/containers/ubuntu-2404.Dockerfile +++ b/ci/containers/ubuntu-2404.Dockerfile @@ -37,6 +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 -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +ENV LANG="en_US.UTF-8" +ENV PYTHON="/usr/bin/python3" diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index b37c007..ba12be4 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -60,30 +60,30 @@ x86_64-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -x86_64-fedora-40: +x86_64-fedora-41: extends: .native_build_job needs: - - job: x86_64-fedora-40-container + - job: x86_64-fedora-41-container optional: true allow_failure: false variables: - NAME: fedora-40 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40 + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 artifacts: expire_in: 1 hour paths: - libvirt-python-rpms -x86_64-fedora-41: +x86_64-fedora-42: extends: .native_build_job needs: - - job: x86_64-fedora-41-container + - job: x86_64-fedora-42-container optional: true allow_failure: false variables: - NAME: fedora-41 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 + NAME: fedora-42 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:42 artifacts: expire_in: 1 hour paths: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 65b85c3..03e7f79 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -28,18 +28,18 @@ x86_64-debian-sid-container: NAME: debian-sid -x86_64-fedora-40-container: +x86_64-fedora-41-container: extends: .container_job allow_failure: false variables: - NAME: fedora-40 + NAME: fedora-41 -x86_64-fedora-41-container: +x86_64-fedora-42-container: extends: .container_job allow_failure: false variables: - NAME: fedora-41 + NAME: fedora-42 x86_64-fedora-rawhide-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index 1412f44..6f353df 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -38,7 +38,7 @@ targets: - arch: x86_64 allow-failure: true - fedora-40: + fedora-41: jobs: - arch: x86_64 artifacts: @@ -46,7 +46,7 @@ targets: paths: - libvirt-python-rpms - fedora-41: + fedora-42: jobs: - arch: x86_64 artifacts: -- 2.11.4.GIT