From f3e3795f487930f89ee6ea947ddb42d95af0e45b Mon Sep 17 00:00:00 2001
From: Victor Julien <vjulien@oisf.net>
Date: Mon, 2 Feb 2026 08:03:04 +0100
Subject: [PATCH] github-ci: relax namespace shutdown error checks

Caddy would sometimes return an error during shutdown. Add a warning if
this happens, but don't fail the job.
---
 .github/workflows/netns/afp-ips-netns-bridge.sh | 9 +++++++++
 .github/workflows/netns/nfq-ips-netns-route.sh  | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/.github/workflows/netns/afp-ips-netns-bridge.sh b/.github/workflows/netns/afp-ips-netns-bridge.sh
index d6ae4e110e..fd10a98fb9 100755
--- a/.github/workflows/netns/afp-ips-netns-bridge.sh
+++ b/.github/workflows/netns/afp-ips-netns-bridge.sh
@@ -224,13 +224,22 @@ fi
 echo "* server pings received check... done"
 
 echo "* shutting down..."
+set +e
 kill -INT $CADDYPID
 wait $CADDYPID
+CADDYRES=$?
+set -e
 ip netns exec $dutns \
     ${SURICATASC} -c "shutdown" /var/run/suricata/suricata-command.socket
 wait $SURIPID
 echo "* shutting down... done"
 
+# Caddy sometimes exits uncleanly. Warn about it but otherwise
+# it can be ignored.
+if [ $CADDYRES -ne 0 ]; then
+    echo "WARNING Caddy exited with error $CADDYRES"
+fi
+
 echo "* dumping some stats..."
 cat ./eve.json | jq -c 'select(.tls)'|tail -n1|jq
 cat ./eve.json | jq -c 'select(.stats)|.stats.ips'|tail -n1|jq
diff --git a/.github/workflows/netns/nfq-ips-netns-route.sh b/.github/workflows/netns/nfq-ips-netns-route.sh
index ce8a53331e..9cf5309fb9 100755
--- a/.github/workflows/netns/nfq-ips-netns-route.sh
+++ b/.github/workflows/netns/nfq-ips-netns-route.sh
@@ -238,13 +238,22 @@ fi
 echo "* server pings received check... done"
 
 echo "* shutting down..."
+set +e
 kill -INT $CADDYPID
 wait $CADDYPID
+CADDYRES=$?
+set -e
 ip netns exec $dutns \
     ${SURICATASC} -c "shutdown" /var/run/suricata/suricata-command.socket
 wait $SURIPID
 echo "* shutting down... done"
 
+# Caddy sometimes exits uncleanly. Warn about it but otherwise
+# it can be ignored.
+if [ $CADDYRES -ne 0 ]; then
+    echo "WARNING Caddy exited with error $CADDYRES"
+fi
+
 echo "* dumping some stats..."
 cat ./eve.json | jq -c 'select(.tls)'|tail -n1|jq
 cat ./eve.json | jq -c 'select(.stats)|.stats.ips'|tail -n1|jq