From: Stefan Hajnoczi <[email protected]> Cirrus has shut down and the x64-freebsd-14-build is failing: https://gitlab.com/qemu-project/qemu/-/jobs/14656732122
Remove the x64-freebsd-14-build job to get the CI pipeline passing again. The next commit will be to remove Cirrus integration from the GitLab YAML and lcitool since it is no longer used. Signed-off-by: Stefan Hajnoczi <[email protected]> Reviewed-by: Pierrick Bouvier <[email protected]> Reviewed-by: Warner Losh <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-id: [email protected] Signed-off-by: Stefan Hajnoczi <[email protected]> (cherry picked from commit 4023f38b50a42a9a936ee3c1c3a9642110e42916) Signed-off-by: Michael Tokarev <[email protected]> diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index b71ab090b6..4769d00c67 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -30,17 +30,3 @@ - cirrus-run -v --show-build-log always .gitlab-ci.d/cirrus/$NAME.yml variables: QEMU_JOB_CIRRUS: 1 - -x64-freebsd-14-build: - extends: .cirrus_build_job - variables: - NAME: freebsd-14 - CIRRUS_VM_INSTANCE_TYPE: freebsd_instance - CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_IMAGE_NAME: freebsd-14-3 - CIRRUS_VM_CPUS: 8 - CIRRUS_VM_RAM: 8G - UPDATE_COMMAND: pkg update; pkg upgrade -y - INSTALL_COMMAND: pkg install -y - CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,mips64el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4eb-softmmu,xtensa-softmmu --enable-rust - TEST_TARGETS: check diff --git a/.gitlab-ci.d/cirrus/freebsd-14.vars b/.gitlab-ci.d/cirrus/freebsd-14.vars deleted file mode 100644 index 98fbde6cc6..0000000000 --- a/.gitlab-ci.d/cirrus/freebsd-14.vars +++ /dev/null @@ -1,16 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool variables freebsd-14 qemu -# -# https://gitlab.com/libvirt/libvirt-ci - -CCACHE='/usr/local/bin/ccache' -CPAN_PKGS='' -CROSS_PKGS='' -MAKE='/usr/local/bin/gmake' -NINJA='/usr/local/bin/ninja' -PACKAGING_COMMAND='pkg' -PIP3='/usr/local/bin/pip' -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache4 cmocka coreutils ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk-vnc gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson mtools ncurses nettle ninja opencv pixman pkgconf png py311-numpy py311-pillow py311-pip py311-pyyaml py311-setuptools py311-sphinx py311-sphinx_rtd_theme py311-tomli py311-wheel python3 rpm2cpio rust rust-bindgen-cli sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 vulkan-tools xorriso zstd' -PYPI_PKGS='' -PYTHON='/usr/local/bin/python3' diff --git a/MAINTAINERS b/MAINTAINERS index ad215eced8..8cc89d4feb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4502,9 +4502,7 @@ FreeBSD Hosted Continuous Integration M: Ed Maste <[email protected]> M: Li-Wen Hsu <[email protected]> S: Maintained -F: .gitlab-ci.d/cirrus/freebsd* F: tests/vm/freebsd -W: https://cirrus-ci.com/github/qemu/qemu Functional testing framework M: Thomas Huth <[email protected]> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 4289cc381a..ad6a1e6fe8 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -313,11 +313,6 @@ try: enable_rust=False, trailer="".join(debian_all_test_cross_compilers)) - # - # Cirrus packages lists for GitLab - # - generate_cirrus("freebsd-14") - # # GitLab packages lists # -- 2.47.3
