Merge #20543: ci: no-longer exclude feature_block in TSAN job

2b356117e94f9ef27b67a8e98663f5d676f58c11 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 2b356117e94f9ef27b67a8e98663f5d676f58c11 - checked the CI run and confirmed that the feature_block runs: https://cirrus-ci.com/task/6008403543719936?command=ci#L3249
  MarcoFalke:
    review ACK 2b356117e94f9ef27b67a8e98663f5d676f58c11

Tree-SHA512: b774995600361c74bc3267b566e12add66a4604bdf88f6e3f69669edbb8d7aff6f20fdbf0ef98187be4730ce4e18b1939bbcecd993a5c5c1ff40b237c7921b71
This commit is contained in:
MarcoFalke 2020-12-02 10:56:10 +01:00 committed by Konstantin Akimov
parent fcb4c20802
commit 2fa526bb81
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524

View File

@ -81,8 +81,8 @@ task:
<< : *GLOBAL_TASK_TEMPLATE << : *GLOBAL_TASK_TEMPLATE
container: container:
image: ubuntu:lunar image: ubuntu:lunar
cpu: 4 # Double CPU and Memory to avoid timeout cpu: 4 # Double CPU and increase Memory to avoid timeout
memory: 16G memory: 24G
env: env:
MAKEJOBS: "-j8" MAKEJOBS: "-j8"
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh" FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"