Skip to content

Commit 3693fcc

Browse files
author
MarcoFalke
committed
Merge #20543: ci: no-longer exclude feature_block in TSAN job
2b35611 ci: no-longer exclude feature_block in TSAN job (fanquake) Pull request description: The TSAN job is now running on Cirrus. Increase the allocated memory to the [maximum allowed](https://cirrus-ci.org/guide/linux/#linux-containers). ACKs for top commit: jonasschnelli: utACK 2b35611 - checked the CI run and confirmed that the feature_block runs: https://cirrus-ci.com/task/6008403543719936?command=ci#L3249 MarcoFalke: review ACK 2b35611 Tree-SHA512: b774995600361c74bc3267b566e12add66a4604bdf88f6e3f69669edbb8d7aff6f20fdbf0ef98187be4730ce4e18b1939bbcecd993a5c5c1ff40b237c7921b71
2 parents c33662a + 2b35611 commit 3693fcc

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ task:
9292
<< : *GLOBAL_TASK_TEMPLATE
9393
container:
9494
image: ubuntu:focal
95-
cpu: 4 # Double CPU and Memory to avoid timeout
96-
memory: 16G
95+
cpu: 4 # Double CPU and increase Memory to avoid timeout
96+
memory: 24G
9797
env:
9898
MAKEJOBS: "-j8"
9999
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"

ci/test/00_setup_env_native_tsan.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ export CONTAINER_NAME=ci_native_tsan
1010
export DOCKER_NAME_TAG=ubuntu:20.04
1111
export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq"
1212
export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'"
13-
export TEST_RUNNER_EXTRA="--exclude feature_block" # Low memory on Travis machines, exclude feature_block.
1413
export GOAL="install"
1514
export BITCOIN_CONFIG="--enable-zmq --with-gui=no CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' CXXFLAGS='-g' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++' --with-boost-process"

0 commit comments

Comments
 (0)