From fae8de926abaa9d7e5f0769865ded9491a72f866 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Fri, 5 May 2023 08:51:41 +0200
Subject: [PATCH] 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.
---
 ci/test/06_script_b.sh | 5 -----
 ci/test_run_all.sh     | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh
index e0fae18b8eb..ea365d8314c 100755
--- a/ci/test/06_script_b.sh
+++ b/ci/test/06_script_b.sh
@@ -99,8 +99,3 @@ fi
 if [ "$RUN_FUZZ_TESTS" = "true" ]; then
   CI_EXEC LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" test/fuzz/test_runner.py "${FUZZ_TESTS_CONFIG}" "$MAKEJOBS" -l DEBUG "${DIR_FUZZ_IN}"
 fi
-
-if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
-  echo "Stop and remove CI container by ID"
-  docker container kill "${CI_CONTAINER_ID}"
-fi
diff --git a/ci/test_run_all.sh b/ci/test_run_all.sh
index 93b07aab1ec..f517d1b30e1 100755
--- a/ci/test_run_all.sh
+++ b/ci/test_run_all.sh
@@ -11,3 +11,8 @@ set -o errexit; source ./ci/test/04_install.sh
 set -o errexit; source ./ci/test/05_before_script.sh
 set -o errexit; source ./ci/test/06_script_a.sh
 set -o errexit; source ./ci/test/06_script_b.sh
+
+if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
+  echo "Stop and remove CI container by ID"
+  docker container kill "${CI_CONTAINER_ID}"
+fi