Try a little script before fixing failure.

Signed-off-by: fruffy <[email protected]>

Author: fruffy

.github/workflows/ci-test-ubuntu.yml

@@ -64,8 +64,6 @@ jobs:
           export SDE=`pwd`
           export SDE_INSTALL="`pwd`/install"
 
-          sudo ${SDE_INSTALL}/bin/veth_setup.sh 128
-          ./run_tofino_model.sh -p tna_counter --arch tofino -q |& sed 's/^/model: /' &
-          ./run_switchd.sh -p tna_counter --arch tofino |& sed 's/^/switchd: /' &
-          timeout 10800 ./run_p4_tests.sh -p tna_counter --arch tofino |& sed 's/^/tests: /'
+          # Exit on error and ensure pipelines fail on any command failure
+          ./ci/run-test.sh tna_counter
 

ci/run-test.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+THIS_DIR=$( cd -- "$( dirname -- "${0}" )" &> /dev/null && pwd )
+ROOT_DIR=$(readlink -f ${THIS_DIR}/..)
+
+set -e  # Exit on any command failure.
+set -o pipefail  # Ensure failure in pipes propagates.
+
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <P4_PROGRAM>"
+    exit 1
+fi
+
+P4_PROGRAM="$1"
+
+sudo "${SDE_INSTALL}/bin/veth_setup.sh" 128
+$ROOT_DIR/run_tofino_model.sh -p "$P4_PROGRAM" --arch tofino -q |& sed 's/^/model: /' &
+MODEL_PID=$!
+$ROOT_DIR/run_switchd.sh -p "$P4_PROGRAM" --arch tofino |& sed 's/^/switchd: /' &
+SWITCHD_PID=$!
+timeout 10800 $ROOT_DIR/run_p4_tests.sh -p "$P4_PROGRAM" --arch tofino |& sed 's/^/tests: /'
+TESTS_EXIT_CODE=$?
+
+echo "Stopping tofino model and switchd..."
+kill $MODEL_PID $SWITCHD_PID || true
+wait $MODEL_PID 2>/dev/null || true
+wait $SWITCHD_PID 2>/dev/null || true
+exit $TESTS_EXIT_CODE