From: Michal Privoznik <mprivozn@redhat.com> Notable changes: - Drop Fedora 42, add Fedora 44 - Drop Freebsd 13, add Freebsd 15 - Drop Ubuntu 22.04, add Ubuntu 26.04 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- Not so green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/2500774756 Those two failed jobs are because leap15 is having some difficulties right now. ...-mingw32.sh => fedora-44-cross-mingw32.sh} | 0 ...-mingw64.sh => fedora-44-cross-mingw64.sh} | 0 ci/buildenv/{fedora-42.sh => fedora-44.sh} | 0 .../{ubuntu-2204.sh => ubuntu-2604.sh} | 2 +- .../{freebsd-13.vars => freebsd-15.vars} | 2 +- ci/cirrus/macos-14.vars | 2 +- ...ile => fedora-44-cross-mingw32.Dockerfile} | 2 +- ...ile => fedora-44-cross-mingw64.Dockerfile} | 2 +- ...ora-42.Dockerfile => fedora-44.Dockerfile} | 2 +- ...2204.Dockerfile => ubuntu-2604.Dockerfile} | 4 +- ci/gitlab/builds.yml | 108 +++++++++--------- ci/gitlab/containers.yml | 36 +++--- ci/manifest.yml | 28 ++--- 13 files changed, 94 insertions(+), 94 deletions(-) rename ci/buildenv/{fedora-43-cross-mingw32.sh => fedora-44-cross-mingw32.sh} (100%) rename ci/buildenv/{fedora-43-cross-mingw64.sh => fedora-44-cross-mingw64.sh} (100%) rename ci/buildenv/{fedora-42.sh => fedora-44.sh} (100%) rename ci/buildenv/{ubuntu-2204.sh => ubuntu-2604.sh} (98%) rename ci/cirrus/{freebsd-13.vars => freebsd-15.vars} (95%) rename ci/containers/{fedora-43-cross-mingw32.Dockerfile => fedora-44-cross-mingw32.Dockerfile} (98%) rename ci/containers/{fedora-43-cross-mingw64.Dockerfile => fedora-44-cross-mingw64.Dockerfile} (98%) rename ci/containers/{fedora-42.Dockerfile => fedora-44.Dockerfile} (98%) rename ci/containers/{ubuntu-2204.Dockerfile => ubuntu-2604.Dockerfile} (97%) diff --git a/ci/buildenv/fedora-43-cross-mingw32.sh b/ci/buildenv/fedora-44-cross-mingw32.sh similarity index 100% rename from ci/buildenv/fedora-43-cross-mingw32.sh rename to ci/buildenv/fedora-44-cross-mingw32.sh diff --git a/ci/buildenv/fedora-43-cross-mingw64.sh b/ci/buildenv/fedora-44-cross-mingw64.sh similarity index 100% rename from ci/buildenv/fedora-43-cross-mingw64.sh rename to ci/buildenv/fedora-44-cross-mingw64.sh diff --git a/ci/buildenv/fedora-42.sh b/ci/buildenv/fedora-44.sh similarity index 100% rename from ci/buildenv/fedora-42.sh rename to ci/buildenv/fedora-44.sh diff --git a/ci/buildenv/ubuntu-2204.sh b/ci/buildenv/ubuntu-2604.sh similarity index 98% rename from ci/buildenv/ubuntu-2204.sh rename to ci/buildenv/ubuntu-2604.sh index f29d3c49ab..459a306061 100644 --- a/ci/buildenv/ubuntu-2204.sh +++ b/ci/buildenv/ubuntu-2604.sh @@ -33,7 +33,7 @@ function install_buildenv() { libblkid-dev \ libc6-dev \ libcap-ng-dev \ - libclang-dev \ + libclang-rt-dev \ libcurl4-gnutls-dev \ libdevmapper-dev \ libfuse3-dev \ diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-15.vars similarity index 95% rename from ci/cirrus/freebsd-13.vars rename to ci/cirrus/freebsd-15.vars index ac8f9501aa..b99c663efe 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-15.vars @@ -10,7 +10,7 @@ CROSS_PKGS='' MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' -PIP3='/usr/local/bin/pip-3.8' +PIP3='/usr/local/bin/pip' PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs3 gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/macos-14.vars b/ci/cirrus/macos-14.vars index d23fe3cd47..823de9e6a0 100644 --- a/ci/cirrus/macos-14.vars +++ b/ci/cirrus/macos-14.vars @@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake' NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/opt/homebrew/bin/pip3' -PKGS='augeas bash-completion black ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep json-c libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline' +PKGS='augeas bash-completion black ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep json-c libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python-setuptools python3 qemu readline' PYPI_PKGS='pytest' PYTHON='/opt/homebrew/bin/python3' diff --git a/ci/containers/fedora-43-cross-mingw32.Dockerfile b/ci/containers/fedora-44-cross-mingw32.Dockerfile similarity index 98% rename from ci/containers/fedora-43-cross-mingw32.Dockerfile rename to ci/containers/fedora-44-cross-mingw32.Dockerfile index 9c517b54d4..998a173883 100644 --- a/ci/containers/fedora-43-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-44-cross-mingw32.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:43 +FROM registry.fedoraproject.org/fedora:44 RUN dnf --quiet install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/ci/containers/fedora-43-cross-mingw64.Dockerfile b/ci/containers/fedora-44-cross-mingw64.Dockerfile similarity index 98% rename from ci/containers/fedora-43-cross-mingw64.Dockerfile rename to ci/containers/fedora-44-cross-mingw64.Dockerfile index 763611b9c9..b5f5e9dd47 100644 --- a/ci/containers/fedora-43-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-44-cross-mingw64.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:43 +FROM registry.fedoraproject.org/fedora:44 RUN dnf --quiet install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/ci/containers/fedora-42.Dockerfile b/ci/containers/fedora-44.Dockerfile similarity index 98% rename from ci/containers/fedora-42.Dockerfile rename to ci/containers/fedora-44.Dockerfile index 8fbffdda76..74f234c955 100644 --- a/ci/containers/fedora-42.Dockerfile +++ b/ci/containers/fedora-44.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:42 +FROM registry.fedoraproject.org/fedora:44 RUN dnf --quiet install -y nosync && \ printf '#!/bin/sh\n\ diff --git a/ci/containers/ubuntu-2204.Dockerfile b/ci/containers/ubuntu-2604.Dockerfile similarity index 97% rename from ci/containers/ubuntu-2204.Dockerfile rename to ci/containers/ubuntu-2604.Dockerfile index b93e1b1470..a631af360f 100644 --- a/ci/containers/ubuntu-2204.Dockerfile +++ b/ci/containers/ubuntu-2604.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/ubuntu:22.04 +FROM docker.io/library/ubuntu:26.04 RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ @@ -35,7 +35,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libblkid-dev \ libc6-dev \ libcap-ng-dev \ - libclang-dev \ + libclang-rt-dev \ libcurl4-gnutls-dev \ libdevmapper-dev \ libfuse3-dev \ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 7e671b7d99..aeef337a66 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -144,21 +144,6 @@ x86_64-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -x86_64-fedora-42: - extends: .native_build_job - needs: - - job: x86_64-fedora-42-container - optional: true - allow_failure: false - variables: - NAME: fedora-42 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:42 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - - x86_64-fedora-43: extends: .native_build_job needs: @@ -174,6 +159,21 @@ x86_64-fedora-43: - libvirt-rpms +x86_64-fedora-44: + extends: .native_build_job + needs: + - job: x86_64-fedora-44-container + optional: true + allow_failure: false + variables: + NAME: fedora-44 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:44 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + + x86_64-fedora-rawhide: extends: .native_build_job needs: @@ -223,17 +223,6 @@ x86_64-opensuse-tumbleweed: TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/tumbleweed:latest -x86_64-ubuntu-2204: - extends: .native_build_job - needs: - - job: x86_64-ubuntu-2204-container - optional: true - allow_failure: false - variables: - NAME: ubuntu-2204 - TARGET_BASE_IMAGE: docker.io/library/ubuntu:22.04 - - x86_64-ubuntu-2404: extends: .native_build_job needs: @@ -241,22 +230,33 @@ x86_64-ubuntu-2404: optional: true allow_failure: false variables: - JOB_OPTIONAL: 1 NAME: ubuntu-2404 TARGET_BASE_IMAGE: docker.io/library/ubuntu:24.04 -x86_64-ubuntu-2404-clang: +x86_64-ubuntu-2604: extends: .native_build_job needs: - - job: x86_64-ubuntu-2404-container + - job: x86_64-ubuntu-2604-container + optional: true + allow_failure: false + variables: + JOB_OPTIONAL: 1 + NAME: ubuntu-2604 + TARGET_BASE_IMAGE: docker.io/library/ubuntu:26.04 + + +x86_64-ubuntu-2604-clang: + extends: .native_build_job + needs: + - job: x86_64-ubuntu-2604-container optional: true allow_failure: false variables: CC: clang MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined - NAME: ubuntu-2404 - TARGET_BASE_IMAGE: docker.io/library/ubuntu:24.04 + NAME: ubuntu-2604 + TARGET_BASE_IMAGE: docker.io/library/ubuntu:26.04 UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1 @@ -457,29 +457,29 @@ s390x-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -mingw32-fedora-43: +mingw32-fedora-44: extends: .cross_build_job needs: - - job: mingw32-fedora-43-container + - job: mingw32-fedora-44-container optional: true allow_failure: false variables: CROSS: mingw32 JOB_OPTIONAL: 1 - NAME: fedora-43 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:43 + NAME: fedora-44 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:44 -mingw64-fedora-43: +mingw64-fedora-44: extends: .cross_build_job needs: - - job: mingw64-fedora-43-container + - job: mingw64-fedora-44-container optional: true allow_failure: false variables: CROSS: mingw64 - NAME: fedora-43 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:43 + NAME: fedora-44 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:44 mingw32-fedora-rawhide: @@ -509,21 +509,6 @@ mingw64-fedora-rawhide: # Native cirrus build jobs -x86_64-freebsd-13: - extends: .cirrus_build_job - needs: [] - allow_failure: - exit_codes: 3 - variables: - CIRRUS_VM_IMAGE_NAME: freebsd-13-5 - CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_INSTANCE_TYPE: freebsd_instance - INSTALL_COMMAND: pkg install -y - NAME: freebsd-13 - UPDATE_COMMAND: pkg update - UPGRADE_COMMAND: pkg upgrade -y - - x86_64-freebsd-14: extends: .cirrus_build_job needs: [] @@ -539,6 +524,21 @@ x86_64-freebsd-14: UPGRADE_COMMAND: pkg upgrade -y +x86_64-freebsd-15: + extends: .cirrus_build_job + needs: [] + allow_failure: + exit_codes: 3 + variables: + CIRRUS_VM_IMAGE_NAME: freebsd-15-0 + CIRRUS_VM_IMAGE_SELECTOR: image_family + CIRRUS_VM_INSTANCE_TYPE: freebsd_instance + INSTALL_COMMAND: pkg install -y + NAME: freebsd-15 + UPDATE_COMMAND: pkg update + UPGRADE_COMMAND: pkg upgrade -y + + aarch64-macos-14: extends: .cirrus_build_job needs: [] diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 1fbf11b21a..1383c6388e 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -63,13 +63,6 @@ x86_64-debian-sid-container: NAME: debian-sid -x86_64-fedora-42-container: - extends: .container_job - allow_failure: false - variables: - NAME: fedora-42 - - x86_64-fedora-43-container: extends: .container_job allow_failure: false @@ -77,6 +70,13 @@ x86_64-fedora-43-container: NAME: fedora-43 +x86_64-fedora-44-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-44 + + x86_64-fedora-rawhide-container: extends: .container_job allow_failure: true @@ -98,13 +98,6 @@ x86_64-opensuse-tumbleweed-container: NAME: opensuse-tumbleweed -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 @@ -112,6 +105,13 @@ x86_64-ubuntu-2404-container: NAME: ubuntu-2404 +x86_64-ubuntu-2604-container: + extends: .container_job + allow_failure: false + variables: + NAME: ubuntu-2604 + + # Cross container jobs @@ -234,19 +234,19 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x -mingw32-fedora-43-container: +mingw32-fedora-44-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: fedora-43-cross-mingw32 + NAME: fedora-44-cross-mingw32 -mingw64-fedora-43-container: +mingw64-fedora-44-container: extends: .container_job allow_failure: false variables: - NAME: fedora-43-cross-mingw64 + NAME: fedora-44-cross-mingw64 mingw32-fedora-rawhide-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index a673f0c413..94639cf0b8 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -125,14 +125,6 @@ targets: containers: false builds: false - fedora-42: - jobs: - - arch: x86_64 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - fedora-43: jobs: - arch: x86_64 @@ -141,6 +133,14 @@ targets: paths: - libvirt-rpms + fedora-44: + jobs: + - arch: x86_64 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + - arch: mingw32 builds: false @@ -165,10 +165,10 @@ targets: allow-failure: true builds: false - freebsd-13: x86_64 - freebsd-14: x86_64 + freebsd-15: x86_64 + opensuse-leap-15: jobs: - arch: x86_64 @@ -191,11 +191,11 @@ targets: PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - ubuntu-2204: - jobs: - - arch: x86_64 - ubuntu-2404: + jobs: + - arch: x86_64 + + ubuntu-2604: jobs: - arch: x86_64 builds: false -- 2.53.0