From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 3 Jan 2024 09:07:49 +0000 (+0100)
Subject: ci: Switch from FreeBSD 12.0 to FreeBSD 14.0
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8a7b3ded608e410d3bfe2ab933247bf7cca45f6e;p=libvirt.git

ci: Switch from FreeBSD 12.0 to FreeBSD 14.0

FreeBSD 12.0 is no longer supported since 14.0 is out. Change the
CI manifest and refresh the rest.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
deleted file mode 100644
index 278b5834f6..0000000000
--- a/ci/cirrus/freebsd-12.vars
+++ /dev/null
@@ -1,16 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# 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-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-black py39-docutils py39-flake8 py39-pytest python3 qemu readline yajl'
-PYPI_PKGS=''
-PYTHON='/usr/local/bin/python3'
diff --git a/ci/cirrus/freebsd-14.vars b/ci/cirrus/freebsd-14.vars
new file mode 100644
index 0000000000..278b5834f6
--- /dev/null
+++ b/ci/cirrus/freebsd-14.vars
@@ -0,0 +1,16 @@
+# THIS FILE WAS AUTO-GENERATED
+#
+#  $ lcitool manifest ci/manifest.yml
+#
+# 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-3.8'
+PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-black py39-docutils py39-flake8 py39-pytest python3 qemu readline yajl'
+PYPI_PKGS=''
+PYTHON='/usr/local/bin/python3'
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 4cb338fac9..414c663e47 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -1028,30 +1028,30 @@ mingw64-fedora-rawhide-local-env:
 
 # Native cirrus build jobs
 
-x86_64-freebsd-12:
+x86_64-freebsd-13:
   extends: .cirrus_build_job
   needs: []
   allow_failure: false
   variables:
-    CIRRUS_VM_IMAGE_NAME: freebsd-12-4
+    CIRRUS_VM_IMAGE_NAME: freebsd-13-2
     CIRRUS_VM_IMAGE_SELECTOR: image_family
     CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
     INSTALL_COMMAND: pkg install -y
-    NAME: freebsd-12
+    NAME: freebsd-13
     UPDATE_COMMAND: pkg update
     UPGRADE_COMMAND: pkg upgrade -y
 
 
-x86_64-freebsd-13:
+x86_64-freebsd-14:
   extends: .cirrus_build_job
   needs: []
   allow_failure: false
   variables:
-    CIRRUS_VM_IMAGE_NAME: freebsd-13-2
+    CIRRUS_VM_IMAGE_NAME: freebsd-14-0
     CIRRUS_VM_IMAGE_SELECTOR: image_family
     CIRRUS_VM_INSTANCE_TYPE: freebsd_instance
     INSTALL_COMMAND: pkg install -y
-    NAME: freebsd-13
+    NAME: freebsd-14
     UPDATE_COMMAND: pkg update
     UPGRADE_COMMAND: pkg upgrade -y
 
diff --git a/ci/manifest.yml b/ci/manifest.yml
index afb1fa007d..a0f64df3fd 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -192,10 +192,10 @@ targets:
         allow-failure: true
         builds: false
 
-  freebsd-12: x86_64
-
   freebsd-13: x86_64
 
+  freebsd-14: x86_64
+
   opensuse-leap-15:
     jobs:
       - arch: x86_64