[PATCH for-4.21 v2 0/3] cirrus-ci: get testing working again

[PATCH for-4.21 v2 0/3] cirrus-ci: get testing working again

[Roger Pau Monne]

Hello,

The following series fixes Cirrus-CI testing so it's fully working
again.  I request a release-ack to get those committed (once reviewed).
The risk is very low, since they only modify Cirrus-CI code, so
Gitlab-CI is not changed at all.

Roger Pau Monne (3):
  cirrus-ci: install libinotify for FreeBSD
  cirrus-ci: fix bashism in the test_script code
  cirrus-ci: bump FreeBSD version

 .cirrus.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

-- 
2.51.0

[PATCH for-4.21 v2 1/3] cirrus-ci: install libinotify for FreeBSD

[Roger Pau Monne]

FreeBSD QEMU build requires libinotify, otherwise the build fails with:

./qemu-xen-dir-remote/meson.build:2535:15: ERROR: C shared or static library 'inotify' not found

Install the package and add the /usr/local include and libs paths
explicitly as QEMU configure options.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
 .cirrus.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index f295c8cb0a02..10d8371ccc38 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -51,11 +51,12 @@ task:
   install_script: pkg install -y seabios gmake ninja bash
                                  pkgconf bison perl5
                                  yajl lzo2 pixman argp-standalone
-                                 libxml2 glib git python3
+                                 libxml2 glib git python3 libinotify
 
   configure_script:
     - cc --version
     - ./configure --with-system-seabios=/usr/local/share/seabios/bios.bin
+                  --with-extra-qemuu-configure-args="--extra-ldflags=-L${APPEND_LIB} --extra-cflags=-I${APPEND_INCLUDES}"
     - gmake -j`sysctl -n hw.ncpu` -C xen clang=y defconfig
 
   << : *FREEBSD_CONFIGURE_ARTIFACTS
-- 
2.51.0

[PATCH for-4.21 v2 2/3] cirrus-ci: fix bashism in the test_script code

[Roger Pau Monne]

The default shell in FreeBSD is plain sh, which doesn't support the usage
of the '|&' operator:

./automation/scripts/console.exp |& sed 's/\r\+$//'
/tmp/scripts34c427adc6599db29cb91221a0939d85.sh: 16: Syntax error: "&" unexpected

Fix this by using a redirection of stderr into stdout, and then a pipe.

Fixes: a406195c15dd ("automation: call expect script with redirected standard error")
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 10d8371ccc38..30108892b751 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -167,7 +167,7 @@ task:
     export TEST_LOG="serial-${FREEBSD_BUILD}-${XTF_ARCH}.txt"
     export PASSED="Test result: SUCCESS"
     export TEST_TIMEOUT=120
-    ./automation/scripts/console.exp |& sed 's/\r\+$//'
+    ./automation/scripts/console.exp 2>&1 | sed 's/\r\+$//'
 
   always:
     serial_artifacts:
-- 
2.51.0

[PATCH for-4.21 v2 3/3] cirrus-ci: bump FreeBSD version

[Roger Pau Monne]

Update to latest 14.3.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 30108892b751..7df7ff552222 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -2,7 +2,7 @@
 freebsd_versions: &FREEBSD_VERSIONS
   env:
     FREEBSD_LEGACY:     freebsd-13-5
-    FREEBSD_PRODUCTION: freebsd-14-2
+    FREEBSD_PRODUCTION: freebsd-14-3
     FREEBSD_CURRENT:    freebsd-15-0-snap
 
 # Build jobs
-- 
2.51.0

Re: [PATCH for-4.21 v2 0/3] cirrus-ci: get testing working again

[Oleksii Kurochko]

[-- Attachment #1: Type: text/plain, Size: 640 bytes --]

Hello Roger,

On 10/7/25 9:00 AM, Roger Pau Monne wrote:
> Hello,
>
> The following series fixes Cirrus-CI testing so it's fully working
> again.  I request a release-ack to get those committed (once reviewed).
> The risk is very low, since they only modify Cirrus-CI code, so
> Gitlab-CI is not changed at all.

Release-Acked-By: Oleksii Kurochko<oleksii.kurochko@gmail.com>

Thanks.

~ Oleksii

>
> Roger Pau Monne (3):
>    cirrus-ci: install libinotify for FreeBSD
>    cirrus-ci: fix bashism in the test_script code
>    cirrus-ci: bump FreeBSD version
>
>   .cirrus.yml | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)

[-- Attachment #2: Type: text/html, Size: 1238 bytes --]