Skip to content

Commit fae8de9

Browse files
author
MarcoFalke
committed
ci: Move CI container kill out of 06_script_b.sh
This cleans up 06_script_b.sh to only contain code to be executed inside the CI pod, which avoids confusion and is needed for the next commit.
1 parent fa7d755 commit fae8de9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ci/test/06_script_b.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,3 @@ fi
9999
if [ "$RUN_FUZZ_TESTS" = "true" ]; then
100100
CI_EXEC LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" test/fuzz/test_runner.py "${FUZZ_TESTS_CONFIG}" "$MAKEJOBS" -l DEBUG "${DIR_FUZZ_IN}"
101101
fi
102-
103-
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
104-
echo "Stop and remove CI container by ID"
105-
docker container kill "${CI_CONTAINER_ID}"
106-
fi

ci/test_run_all.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,8 @@ set -o errexit; source ./ci/test/04_install.sh
1111
set -o errexit; source ./ci/test/05_before_script.sh
1212
set -o errexit; source ./ci/test/06_script_a.sh
1313
set -o errexit; source ./ci/test/06_script_b.sh
14+
15+
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
16+
echo "Stop and remove CI container by ID"
17+
docker container kill "${CI_CONTAINER_ID}"
18+
fi

0 commit comments

Comments
 (0)