diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-12-20 12:01:57 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-12-20 12:02:20 +0100 |
| commit | 20aea4945d8011d1b7d9fd69ca4e56eecd5a6529 (patch) | |
| tree | d7d1fc9350516590d02262d7183ecb28273b7fba /.cirrus.yml | |
| parent | 3ec8f9f123bb21a3ac9a0eb7531db92332404356 (diff) | |
| parent | cfeb1942bc9e80be59ef3c2f122d254290db5347 (diff) | |
| download | bitcoin-20aea4945d8011d1b7d9fd69ca4e56eecd5a6529.tar.xz | |
Merge bitcoin/bitcoin#23797: ci: Use Cirrus "greedy" flag to use idle CPU time when available
cfeb1942bc9e80be59ef3c2f122d254290db5347 ci: Use Cirrus "greedy" flag to use idle CPU time when available (Luke Dashjr)
Pull request description:
Disabled for MSan to avoid excessive RAM usage
Top commit has no ACKs.
Tree-SHA512: 4351d477b8749b3578a1f808ba7e963a44e0a4a1b695605b473ab3cf424d75ade6e13e7401a39675843e7c9b48a3e46936909d6bcc4af1f7abe1b690fe5b7a55
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 9ad96e2cdd..9ae936766a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,6 +1,6 @@ env: # Global defaults PACKAGE_MANAGER_INSTALL: "apt-get update && apt-get install -y" - MAKEJOBS: "-j4" + MAKEJOBS: "-j10" TEST_RUNNER_PORT_MIN: "14000" # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache CCACHE_SIZE: "200M" CCACHE_DIR: "/tmp/ccache_dir" @@ -38,6 +38,7 @@ main_template: &MAIN_TEMPLATE # https://cirrus-ci.org/faq/#are-there-any-limits # Each project has 16 CPU in total, assign 2 to each container, so that 8 tasks run in parallel cpu: 2 + greedy: true memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers ccache_cache: folder: "/tmp/ccache_dir" @@ -212,7 +213,6 @@ task: memory: 24G env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV - MAKEJOBS: "-j8" FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh" task: @@ -223,6 +223,7 @@ task: env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV FILE_ENV: "./ci/test/00_setup_env_native_msan.sh" + MAKEJOBS: "-j4" # Avoid excessive memory use due to MSan task: name: '[ASan + LSan + UBSan + integer, no depends] [jammy]' @@ -232,6 +233,7 @@ task: env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV FILE_ENV: "./ci/test/00_setup_env_native_asan.sh" + MAKEJOBS: "-j4" # Avoid excessive memory use task: name: '[fuzzer,address,undefined,integer, no depends] [focal]' @@ -243,7 +245,6 @@ task: memory: 16G env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV - MAKEJOBS: "-j8" FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh" task: @@ -255,7 +256,6 @@ task: memory: 16G # The default memory is sometimes just a bit too small, so double everything env: << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV - MAKEJOBS: "-j8" FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh" task: |