From f535077d87e638bd69fc20911779cdf855b34c87 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Fri, 10 Jul 2026 10:55:27 +0000 Subject: [PATCH 1/3] t_client.sh: If using TEST_RUN_GROUP add it to logdir name That makes it easier to find the right logs after the run. Signed-off-by: Frank Lichtenheld --- t_server/original/client_vm/bin/t_client.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t_server/original/client_vm/bin/t_client.sh b/t_server/original/client_vm/bin/t_client.sh index a180cda..544aa69 100755 --- a/t_server/original/client_vm/bin/t_client.sh +++ b/t_server/original/client_vm/bin/t_client.sh @@ -141,6 +141,9 @@ else fi LOGDIR=t_client-`hostname`-`date +%Y%m%d-%H%M%S` +if [ -n "$TEST_RUN_GROUP" ]; then + LOGDIR="${LOGDIR}-${TEST_RUN_GROUP}" +fi LOGDIR_ABS="$PWD/$LOGDIR" if mkdir $LOGDIR then : From 8dd8ee1e2b763460e65248b0344ee9c6e4a2044a Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Fri, 10 Jul 2026 10:56:32 +0000 Subject: [PATCH 2/3] t_client.sh: Do not try to run resolvectl when systemd is not running In older Ubuntu versions resolvectl is part of the build dependencies of OpenVPN (in newer versions it is a separate package). But we do not have systemd running in the containers. So running resolvectl just gives a warning. Avoid that. Signed-off-by: Frank Lichtenheld --- t_server/original/client_vm/bin/t_client.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t_server/original/client_vm/bin/t_client.sh b/t_server/original/client_vm/bin/t_client.sh index 544aa69..98b53cc 100755 --- a/t_server/original/client_vm/bin/t_client.sh +++ b/t_server/original/client_vm/bin/t_client.sh @@ -243,7 +243,7 @@ get_ifconfig_route() # except Linux and MacOS case $UNAME in Linux) - if [ -x /usr/bin/resolvectl ] ; then + if [ -x /usr/bin/resolvectl -a -d /run/systemd/system ] ; then echo "-- linux resolvectl --" resolvectl status else From a9085cb43b988a61580d8ee6228d1e6c14612daa Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Fri, 10 Jul 2026 11:03:27 +0000 Subject: [PATCH 3/3] run_t_clients.sh: Output full log in case of errors Due to us using TEST_RUN_GROUP the logs are very short. In case there are any failures it is very useful to have them. Signed-off-by: Frank Lichtenheld --- t_server/original/run_t_clients.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/t_server/original/run_t_clients.sh b/t_server/original/run_t_clients.sh index ddf9756..d5ec1b8 100755 --- a/t_server/original/run_t_clients.sh +++ b/t_server/original/run_t_clients.sh @@ -49,12 +49,18 @@ do grep "Test sets" $LOG | grep -v none >> $SUMMARY case $RC in 0) ;; # all good - 30) EXIT_CODE=1 ;; # some tests failed + 30) # some tests failed + EXIT_CODE=1 + echo "Tests failed in ($T/$G)" + echo "-----------------" + cat $LOG + echo "-----------------" + ;; 77) ;; # no tests run *) # unexpected failure, show more details! echo "Test run $T/$G failed (host=$HOST): rc=$RC" | tee -a $SUMMARY echo "-----------------" - tail $LOG + cat $LOG echo "-----------------" echo "" exit 1