Merge branch 'fix-chutney-ci' into 'main'

fix chutney in CI

See merge request tpo/core/arti!1393
This commit is contained in:
Nick Mathewson 2023-07-10 23:58:13 +00:00
commit e265f65fec
2 changed files with 15 additions and 7 deletions

View File

@ -213,8 +213,9 @@ build-repro:
integration-chutney:
stage: test
image: debian:stable-slim
allow_failure: true
# we use debian 11 as this is currently what rust:latest uses. When rust:latest gets updated,
# this should be changed to stable (and possibly shadow too).
image: debian:11-slim
script:
- ./maint/preserve -u
- apt update

View File

@ -98,9 +98,9 @@ fi
set +e
"$cmd" proxy -c "${CHUTNEY_PATH}/net/nodes/arti.toml" -d 35353 \
"${ARTI_FLAGS[@]}" &
pid=$!
echo "pid=$pid" >> tests/chutney/arti.run
wait "$pid"
arti_pid=$!
echo "pid=$arti_pid" >> tests/chutney/arti.run
wait "$arti_pid"
echo "result=$?" >> tests/chutney/arti.run
) & disown
@ -117,6 +117,13 @@ for idx in $(seq 30); do
echo "waiting for port 9150..."
sleep 1
fi
# verify Arti did not fail early
# shellcheck disable=SC1091
source tests/chutney/arti.run
pid="${pid:?}"
if ! kill -0 "$pid"; then
result="${result:?}"
echo "Arti failed to start with code $result"
exit 1
fi
done