@@ -11,9 +11,6 @@ env: # Global defaults
1111cirrus_ephemeral_worker_template_env : &CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
1212 DANGER_RUN_CI_ON_HOST : " 1" # Containers will be discarded after the run, so there is no risk that the ci scripts modify the system
1313
14- persistent_worker_template_env : &PERSISTENT_WORKER_TEMPLATE_ENV
15- RESTART_CI_DOCKER_BEFORE_RUN : " 1"
16-
1714# https://cirrus-ci.org/guide/persistent-workers/
1815#
1916# It is possible to select a specific persistent worker by label. Refer to the
@@ -24,15 +21,33 @@ persistent_worker_template_env: &PERSISTENT_WORKER_TEMPLATE_ENV
2421# - apt-get is required due to PACKAGE_MANAGER_INSTALL
2522# - podman-docker-4.1+ is required due to the use of `podman` when
2623# RESTART_CI_DOCKER_BEFORE_RUN is set and 4.1+ due to the bugfix in 4.1
27- # (https://github.com/bitcoin/bitcoin/pull/21652)
28- # - The ./ci/ depedencies should be installed:
29- # apt update && apt install screen python3 bash podman-docker curl -y
24+ # (https://github.com/bitcoin/bitcoin/pull/21652#issuecomment-1657098200)
25+ # - The ./ci/ depedencies (with cirrus-cli) should be installed:
26+ #
27+ # ```
28+ # apt update && apt install screen python3 bash podman-docker curl -y && curl -L -o cirrus "https://github.com/cirruslabs/cirrus-cli/releases/latest/download/cirrus-linux-$(dpkg --print-architecture)" && mv cirrus /usr/local/bin/cirrus && chmod +x /usr/local/bin/cirrus
29+ # ```
30+ #
31+ # - There are no strict requirements on the hardware, because having less CPUs
32+ # runs the same CI script (maybe slower). To avoid rare and intermittent OOM
33+ # due to short memory usage spikes, it is recommended to add (and persist)
34+ # swap:
35+ #
36+ # ```
37+ # fallocate -l 16G /swapfile_ci && chmod 600 /swapfile_ci && mkswap /swapfile_ci && swapon /swapfile_ci && ( echo '/swapfile_ci none swap sw 0 0' | sudo tee -a /etc/fstab )
38+ # ```
39+ #
40+ # - To register the persistent worker, open a `screen` session and run:
41+ #
42+ # ```
43+ # RESTART_CI_DOCKER_BEFORE_RUN=1 screen cirrus worker run --labels type=todo_fill_in_type --token todo_fill_in_token
44+ # ```
3045#
3146# The following specific types should exist, with the following requirements:
47+ # - small: For an x86_64 machine, recommended to have 2 CPUs and 8 GB of memory.
48+ # - medium: For an x86_64 machine, recommended to have 4 CPUs and 16 GB of memory.
3249# - lunar: For a machine running the Linux kernel shipped with Ubuntu Lunar 23.04. The machine is recommended to have 4 CPUs and 16 GB of memory.
3350# - arm64: For an aarch64 machine, recommended to have 2 CPUs and 8 GB of memory.
34- persistent_worker_template : &PERSISTENT_WORKER_TEMPLATE
35- persistent_worker : {} # Only use this if the task does not care about the type at all
3651
3752# https://cirrus-ci.org/guide/tips-and-tricks/#sharing-configuration-between-tasks
3853filter_template : &FILTER_TEMPLATE
@@ -99,14 +114,11 @@ task:
99114task :
100115 name : ' tidy [lunar]'
101116 << : *GLOBAL_TASK_TEMPLATE
102- container :
103- cpu : 4
104- memory : 5G
105- docker_arguments :
106- CI_IMAGE_NAME_TAG : ubuntu:lunar
107- FILE_ENV : " ./ci/test/00_setup_env_native_tidy.sh"
117+ persistent_worker :
118+ labels :
119+ type : medium
108120 env :
109- << : *CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
121+ FILE_ENV : " ./ci/test/00_setup_env_native_tidy.sh "
110122
111123task :
112124 name : " Win64 native [vs2022]"
@@ -242,9 +254,10 @@ task:
242254 previous_releases_cache :
243255 folder : " releases"
244256 << : *GLOBAL_TASK_TEMPLATE
245- << : *PERSISTENT_WORKER_TEMPLATE
257+ persistent_worker :
258+ labels :
259+ type : small
246260 env :
247- << : *PERSISTENT_WORKER_TEMPLATE_ENV
248261 FILE_ENV : " ./ci/test/00_setup_env_native_qt5.sh"
249262
250263task :
@@ -281,7 +294,6 @@ task:
281294 labels :
282295 type : lunar # Must use the lunar-specific worker (needed for USDT functional tests)
283296 env :
284- << : *PERSISTENT_WORKER_TEMPLATE_ENV
285297 FILE_ENV : " ./ci/test/00_setup_env_native_asan.sh"
286298
287299task :
0 commit comments