Skip to content

Commit b5ed656

Browse files
committed
Merge bitcoin/bitcoin#27739: ci: Add missing set -e to 01_base_install.sh
fa12558 ci: Avoid leaking HOME var into CI pod (MarcoFalke) aaaa432 ci: Remove "default" test env (MarcoFalke) fa7a87b ci: Add missing set -e to 01_base_install.sh (MarcoFalke) Pull request description: Otherwise errors are silently ignored ACKs for top commit: TheCharlatan: ACK [fa12558](bitcoin/bitcoin@fa12558) hebasto: ACK fa12558 Tree-SHA512: dbf3f16302c83973b78f3a5e7793090bc9ac44fdf20d51a26b30a99a97369971661e9aed1cd810d80d49d60009651ca0a8aeb2bdc24198a143bf4fff0ec89901
2 parents 7d33ae7 + fa12558 commit b5ed656

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

ci/README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ requires `bash`, `docker`, and `python3` to be installed. To install all require
2020
sudo apt install bash docker.io python3
2121
```
2222

23-
To run the default test stage,
24-
25-
```
26-
./ci/test_run_all.sh
27-
```
28-
2923
To run the test stage with a specific configuration,
3024

3125
```

ci/test/00_setup_env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
export LC_ALL=C.UTF-8
88

9+
set -ex
10+
911
# The root dir.
1012
# The ci system copies this folder.
1113
BASE_ROOT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../../ >/dev/null 2>&1 && pwd )
@@ -44,8 +46,6 @@ export TEST_RUNNER_TIMEOUT_FACTOR=${TEST_RUNNER_TIMEOUT_FACTOR:-40}
4446
export TEST_RUNNER_ENV=${TEST_RUNNER_ENV:-}
4547
export RUN_FUZZ_TESTS=${RUN_FUZZ_TESTS:-false}
4648

47-
export CONTAINER_NAME=${CONTAINER_NAME:-ci_unnamed}
48-
export CI_IMAGE_NAME_TAG=${CI_IMAGE_NAME_TAG:-ubuntu:20.04}
4949
# Randomize test order.
5050
# See https://www.boost.org/doc/libs/1_71_0/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/random.html
5151
export BOOST_TEST_RANDOM=${BOOST_TEST_RANDOM:-1}

ci/test/01_base_install.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
export LC_ALL=C.UTF-8
88

9+
set -ex
10+
911
CFG_DONE="ci.base-install-done" # Use a global git setting to remember whether this script ran to avoid running it twice
1012

1113
if [ "$(git config --global ${CFG_DONE})" == "true" ]; then

ci/test/04_install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export BINS_SCRATCH_DIR="${BASE_SCRATCH_DIR}/bins/"
2828
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
2929
# Export all env vars to avoid missing some.
3030
# Though, exclude those with newlines to avoid parsing problems.
31-
python3 -c 'import os; [print(f"{key}={value}") for key, value in os.environ.items() if "\n" not in value]' | tee /tmp/env
31+
python3 -c 'import os; [print(f"{key}={value}") for key, value in os.environ.items() if "\n" not in value and "HOME" not in key]' | tee /tmp/env
3232
echo "Creating $CI_IMAGE_NAME_TAG container to run in"
3333
DOCKER_BUILDKIT=1 ${CI_RETRY_EXE} docker build \
3434
--file "${BASE_ROOT_DIR}/ci/test_imagefile" \

0 commit comments

Comments
 (0)