diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-09-28 13:35:02 +0200 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-10-09 16:17:04 +0200 |
| commit | fa2c894cbb41a64371717139fb3c3ddfb9bb8b19 (patch) | |
| tree | fe6d86a4b44bd4efa830f55608d3fdff1184d771 /ci | |
| parent | fa695b4df069425414fd26b2ddc08d72a6b506f6 (diff) | |
ci: move-only CI_CONTAINER_ID to 02_run_container.sh
This limits the scope of the CI_CONTAINER_ID symbol.
Can be reviewed with --color-moved=dimmed-zebra
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/test/02_run_container.sh | 7 | ||||
| -rwxr-xr-x | ci/test_run_all.sh | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/ci/test/02_run_container.sh b/ci/test/02_run_container.sh index 96fae73359..a7c1e22a6d 100755 --- a/ci/test/02_run_container.sh +++ b/ci/test/02_run_container.sh @@ -68,3 +68,10 @@ CI_EXEC "${BASE_ROOT_DIR}/ci/test/01_base_install.sh" CI_EXEC git config --global --add safe.directory \"*\" CI_EXEC mkdir -p "${BINS_SCRATCH_DIR}" + +CI_EXEC "${BASE_ROOT_DIR}/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 diff --git a/ci/test_run_all.sh b/ci/test_run_all.sh index efc524eb80..3afc47b23e 100755 --- a/ci/test_run_all.sh +++ b/ci/test_run_all.sh @@ -7,11 +7,5 @@ export LC_ALL=C.UTF-8 set -o errexit; source ./ci/test/00_setup_env.sh -set -o errexit; source "./ci/test/02_run_container.sh" set -o errexit -CI_EXEC "${BASE_ROOT_DIR}/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 +"./ci/test/02_run_container.sh" |