Skip to content

Commit cfeb194

Browse files
committed
ci: Use Cirrus "greedy" flag to use idle CPU time when available
MAKEJOBS limited for MSan to avoid excessive RAM usage
1 parent 8c0bd87 commit cfeb194

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.cirrus.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
env: # Global defaults
22
PACKAGE_MANAGER_INSTALL: "apt-get update && apt-get install -y"
3-
MAKEJOBS: "-j4"
3+
MAKEJOBS: "-j10"
44
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
55
CCACHE_SIZE: "200M"
66
CCACHE_DIR: "/tmp/ccache_dir"
@@ -38,6 +38,7 @@ main_template: &MAIN_TEMPLATE
3838
# https://cirrus-ci.org/faq/#are-there-any-limits
3939
# Each project has 16 CPU in total, assign 2 to each container, so that 8 tasks run in parallel
4040
cpu: 2
41+
greedy: true
4142
memory: 8G # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers
4243
ccache_cache:
4344
folder: "/tmp/ccache_dir"
@@ -212,7 +213,6 @@ task:
212213
memory: 24G
213214
env:
214215
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
215-
MAKEJOBS: "-j8"
216216
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
217217

218218
task:
@@ -223,6 +223,7 @@ task:
223223
env:
224224
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
225225
FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"
226+
MAKEJOBS: "-j4" # Avoid excessive memory use due to MSan
226227

227228
task:
228229
name: '[ASan + LSan + UBSan + integer, no depends] [jammy]'
@@ -232,6 +233,7 @@ task:
232233
env:
233234
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
234235
FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
236+
MAKEJOBS: "-j4" # Avoid excessive memory use
235237

236238
task:
237239
name: '[fuzzer,address,undefined,integer, no depends] [focal]'
@@ -243,7 +245,6 @@ task:
243245
memory: 16G
244246
env:
245247
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
246-
MAKEJOBS: "-j8"
247248
FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh"
248249

249250
task:
@@ -255,7 +256,6 @@ task:
255256
memory: 16G # The default memory is sometimes just a bit too small, so double everything
256257
env:
257258
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
258-
MAKEJOBS: "-j8"
259259
FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh"
260260

261261
task:

0 commit comments

Comments
 (0)