Merge bitcoin/bitcoin#27690: ci: Use credits for ARM task

fa3761d19d ci: Reduce tsan CPU and memory for faster scheduling (MarcoFalke)
aaaa07bc84 ci: Use credits for ARM task (MarcoFalke)

Pull request description:

  After https://github.com/bitcoin/bitcoin/pull/27562 the task should finish in less than 10 minutes, so also using credits for it will be cheap and improve dev experience.

ACKs for top commit:
  fanquake:
    ACK fa3761d19d

Tree-SHA512: 98ba76eaa63bcbab674076bb9877b3a20d1b90e6d51e2fd7b97ae245414e984d734006b15ea60228a1f4f9bc72fbe2a1a8910fd05e7c52dd2a8b223bfaa25b50
This commit is contained in:
fanquake 2023-05-18 11:16:34 +01:00
commit 4bca26e744
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1

View file

@ -200,6 +200,7 @@ task:
docker_arguments: docker_arguments:
CI_IMAGE_NAME_TAG: debian:bullseye CI_IMAGE_NAME_TAG: debian:bullseye
FILE_ENV: "./ci/test/00_setup_env_arm.sh" FILE_ENV: "./ci/test/00_setup_env_arm.sh"
<< : *CREDITS_TEMPLATE
env: env:
<< : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
QEMU_USER_CMD: "" # Disable qemu and run the test natively QEMU_USER_CMD: "" # Disable qemu and run the test natively
@ -242,8 +243,8 @@ task:
name: '[TSan, depends, gui] [lunar]' name: '[TSan, depends, gui] [lunar]'
<< : *GLOBAL_TASK_TEMPLATE << : *GLOBAL_TASK_TEMPLATE
container: container:
cpu: 6 # Increase CPU and Memory to avoid timeout cpu: 4
memory: 24G memory: 16G # The default memory is too small, so double everything
docker_arguments: docker_arguments:
CI_IMAGE_NAME_TAG: ubuntu:lunar CI_IMAGE_NAME_TAG: ubuntu:lunar
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh" FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
@ -297,7 +298,7 @@ task:
<< : *GLOBAL_TASK_TEMPLATE << : *GLOBAL_TASK_TEMPLATE
container: container:
cpu: 4 cpu: 4
memory: 16G # The default memory is sometimes just a bit too small, so double everything memory: 16G # The default memory is too small, so double everything
docker_arguments: docker_arguments:
CI_IMAGE_NAME_TAG: ubuntu:focal CI_IMAGE_NAME_TAG: ubuntu:focal
FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh" FILE_ENV: "./ci/test/00_setup_env_i686_multiprocess.sh"