diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-09-06 07:49:58 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-09-06 07:50:00 +0200 |
| commit | 03689317021a72431762c1974530f2a980a7fffa (patch) | |
| tree | 7a8030af0bfb93ee399002157c0c7b6d3702c476 | |
| parent | 3ba25e3bdde3464eed5d2743d68546e48b005544 (diff) | |
| parent | fa8e1487144eab237ffd291397355ef4801f46f8 (diff) | |
Merge #19881: ci: Double tsan CPU and Memory to avoid global timeout
fa8e1487144eab237ffd291397355ef4801f46f8 ci: Double tsan CPU and Memory to avoid global timeout (MarcoFalke)
Pull request description:
Fix #19864
ACKs for top commit:
practicalswift:
ACK fa8e1487144eab237ffd291397355ef4801f46f8 -- patch looks correct
hebasto:
ACK fa8e1487144eab237ffd291397355ef4801f46f8, according to https://cirrus-ci.org/guide/linux/ the limits are:
Tree-SHA512: b6d522290bfe80ed7453387b811628bf42c7657aa6a84d2f5984c8bb16f9857a71eabc6b8a4d63b84227d59b41a8ed7dd85d86cae5628dc9cf6b85bd365248d7
| -rw-r--r-- | .cirrus.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 33bf43d4b1..1c9e1a69ef 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -56,7 +56,10 @@ task: << : *GLOBAL_TASK_TEMPLATE container: image: ubuntu:focal + cpu: 4 # Double CPU and Memory to avoid timeout + memory: 16G env: + MAKEJOBS: "-j8" FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh" task: |