Skip to content

Commit cd5d2f5

Browse files
committed
Merge bitcoin/bitcoin#27976: ci: Start with clean env
fa15f7e ci: Remove no longer applicable section (MarcoFalke) fa378be ci: Start with clean env (MarcoFalke) fa8c250 ci: Limit scope of some env vars (MarcoFalke) Pull request description: Starting with a clean `env` should help to avoid non-determinism, such as the one fixed in bitcoin/bitcoin#27739 (comment) ACKs for top commit: dergoegge: utACK fa15f7e Tree-SHA512: 716b264217557b6524dab92d5a2a8d61ecb982dff475bd0cf5a763070b4c5916cd5995e764eb5d67d9cf2428c29d5fc2f42b32941b54c7c3053123ce448171e5
2 parents f3cc29f + fa15f7e commit cd5d2f5

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

ci/README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ 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 test stage with a specific configuration,
23+
It is recommended to run the ci system in a clean env. To run the test stage
24+
with a specific configuration,
2425

2526
```
26-
FILE_ENV="./ci/test/00_setup_env_arm.sh" ./ci/test_run_all.sh
27+
env -i HOME="$HOME" PATH="$PATH" USER="$USER" bash -c 'FILE_ENV="./ci/test/00_setup_env_arm.sh" ./ci/test_run_all.sh'
2728
```
2829

2930
### Configurations
@@ -38,14 +39,11 @@ the system package manager to install build dependencies. This guarantees that
3839
the tester is using the same versions as the release builds, which also use
3940
`./depends`.
4041

41-
If no `FILE_ENV` has been specified or values are left out, `00_setup_env.sh`
42-
is used as the default configuration with fallback values.
43-
4442
It is also possible to force a specific configuration without modifying the
4543
file. For example,
4644

4745
```
48-
MAKEJOBS="-j1" FILE_ENV="./ci/test/00_setup_env_arm.sh" ./ci/test_run_all.sh
46+
env -i HOME="$HOME" PATH="$PATH" USER="$USER" bash -c 'MAKEJOBS="-j1" FILE_ENV="./ci/test/00_setup_env_arm.sh" ./ci/test_run_all.sh'
4947
```
5048

5149
The files starting with `0n` (`n` greater than 0) are the scripts that are run

ci/test/00_setup_env.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build}
6767
# The folder for previous release binaries.
6868
# This folder exists only on the ci guest, and on the ci host as a volume.
6969
export PREVIOUS_RELEASES_DIR=${PREVIOUS_RELEASES_DIR:-$BASE_ROOT_DIR/prev_releases}
70-
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
7170
export CI_BASE_PACKAGES=${CI_BASE_PACKAGES:-build-essential libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates ccache python3 rsync git procps bison}
7271
export GOAL=${GOAL:-install}
7372
export DIR_QA_ASSETS=${DIR_QA_ASSETS:-${BASE_SCRATCH_DIR}/qa-assets}

ci/test/00_setup_env_mac.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+
export SDK_URL=${SDK_URL:-https://bitcoincore.org/depends-sources/sdks}
10+
911
export CONTAINER_NAME=ci_macos_cross
1012
export CI_IMAGE_NAME_TAG=ubuntu:22.04
1113
export HOST=x86_64-apple-darwin

ci/test/04_install.sh

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

77
export LC_ALL=C.UTF-8
88

9-
export ASAN_OPTIONS="detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1"
10-
export LSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/lsan"
11-
export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1:log_path=${BASE_SCRATCH_DIR}/sanitizer-output/tsan"
12-
export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1"
13-
149
if [ -z "$DANGER_RUN_CI_ON_HOST" ]; then
1510
# Export all env vars to avoid missing some.
1611
# Though, exclude those with newlines to avoid parsing problems.

ci/test/06_script_b.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ export LC_ALL=C.UTF-8
88

99
set -ex
1010

11+
export ASAN_OPTIONS="detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1"
12+
export LSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/lsan"
13+
export TSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/tsan:halt_on_error=1:log_path=${BASE_SCRATCH_DIR}/sanitizer-output/tsan"
14+
export UBSAN_OPTIONS="suppressions=${BASE_ROOT_DIR}/test/sanitizer_suppressions/ubsan:print_stacktrace=1:halt_on_error=1:report_error_type=1"
15+
1116
if [ "$CI_OS_NAME" == "macos" ]; then
1217
top -l 1 -s 0 | awk ' /PhysMem/ {print}'
1318
echo "Number of CPUs: $(sysctl -n hw.logicalcpu)"

0 commit comments

Comments
 (0)