@@ -14,6 +14,7 @@ concurrency:
1414env :
1515 WOLFBOOT_REPO : https://github.com/wolfSSL/wolfBoot.git
1616 WOLFBOOT_BRANCH : master
17+ RENODE_CONTAINER_VERSION : 1.15.3
1718
1819jobs :
1920 keytools :
@@ -131,7 +132,7 @@ jobs:
131132 working-directory : wolfboot
132133 run : |
133134 set -euxo pipefail
134- docker build -t wolfboot-renode-nrf52 -f tools/renode/Dockerfile .
135+ docker build -t wolfboot-renode-nrf52:${RENODE_CONTAINER_VERSION} -f tools/renode/Dockerfile .
135136
136137 - name : Run curated wolfBoot Renode configurations
137138 working-directory : wolfboot
@@ -160,7 +161,7 @@ jobs:
160161 --env RENODE_CHECKOUT=/home/developer/renode \
161162 --env TEST_OPTIONS="$opts" \
162163 --workdir /workspace \
163- wolfboot-renode-nrf52 \
164+ wolfboot-renode-nrf52:${RENODE_CONTAINER_VERSION} \
164165 /bin/bash -lc 'tools/scripts/renode-test-update.sh $TEST_OPTIONS > /tmp/test_results/logs.txt 2>&1'
165166 then
166167 echo "$opts: PASS" | tee -a test_results/summary.txt
@@ -252,13 +253,11 @@ jobs:
252253
253254 printf '%s\n' "$output"
254255
255- if printf '%s\n' "$output" | grep -F "Failure" >/dev/null; then
256- status=1
257- fi
258-
259256 if [ "$status" -eq 0 ]; then
260257 echo "Expected failure, but test-lib succeeded"
261258 exit 1
262259 fi
263260
264- printf '%s\n' "$output" | grep -F "Failure" >/dev/null
261+ if ! printf '%s\n' "$output" | grep -F "Failure" >/dev/null; then
262+ echo "test-lib failed as expected, but did not print the legacy \"Failure\" marker"
263+ fi
0 commit comments