mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-22 23:07:59 +01:00
refactor: Remove PERSISTENT_WORKER_* yaml templates
* PERSISTENT_WORKER_TEMPLATE_ENV is not needed at all, because RESTART_CI_DOCKER_BEFORE_RUN is already set on the persistent worker. * PERSISTENT_WORKER_TEMPLATE can be replaced by pinning the previous_releases task to a type of worker. This should make the CI performance more consistent.
This commit is contained in:
parent
fa1d8955f6
commit
faaa0794b2
1 changed files with 3 additions and 8 deletions
11
.cirrus.yml
11
.cirrus.yml
|
@ -11,9 +11,6 @@ env: # Global defaults
|
||||||
cirrus_ephemeral_worker_template_env: &CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
|
cirrus_ephemeral_worker_template_env: &CIRRUS_EPHEMERAL_WORKER_TEMPLATE_ENV
|
||||||
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
|
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
|
||||||
|
|
||||||
persistent_worker_template_env: &PERSISTENT_WORKER_TEMPLATE_ENV
|
|
||||||
RESTART_CI_DOCKER_BEFORE_RUN: "1"
|
|
||||||
|
|
||||||
# https://cirrus-ci.org/guide/persistent-workers/
|
# https://cirrus-ci.org/guide/persistent-workers/
|
||||||
#
|
#
|
||||||
# It is possible to select a specific persistent worker by label. Refer to the
|
# It is possible to select a specific persistent worker by label. Refer to the
|
||||||
|
@ -51,8 +48,6 @@ persistent_worker_template_env: &PERSISTENT_WORKER_TEMPLATE_ENV
|
||||||
# - medium: For an x86_64 machine, recommended to have 4 CPUs and 16 GB of memory.
|
# - medium: For an x86_64 machine, recommended to have 4 CPUs and 16 GB of memory.
|
||||||
# - 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.
|
# - 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.
|
||||||
# - arm64: For an aarch64 machine, recommended to have 2 CPUs and 8 GB of memory.
|
# - arm64: For an aarch64 machine, recommended to have 2 CPUs and 8 GB of memory.
|
||||||
persistent_worker_template: &PERSISTENT_WORKER_TEMPLATE
|
|
||||||
persistent_worker: {} # Only use this if the task does not care about the type at all
|
|
||||||
|
|
||||||
# https://cirrus-ci.org/guide/tips-and-tricks/#sharing-configuration-between-tasks
|
# https://cirrus-ci.org/guide/tips-and-tricks/#sharing-configuration-between-tasks
|
||||||
filter_template: &FILTER_TEMPLATE
|
filter_template: &FILTER_TEMPLATE
|
||||||
|
@ -259,9 +254,10 @@ task:
|
||||||
previous_releases_cache:
|
previous_releases_cache:
|
||||||
folder: "releases"
|
folder: "releases"
|
||||||
<< : *GLOBAL_TASK_TEMPLATE
|
<< : *GLOBAL_TASK_TEMPLATE
|
||||||
<< : *PERSISTENT_WORKER_TEMPLATE
|
persistent_worker:
|
||||||
|
labels:
|
||||||
|
type: small
|
||||||
env:
|
env:
|
||||||
<< : *PERSISTENT_WORKER_TEMPLATE_ENV
|
|
||||||
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
|
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
|
||||||
|
|
||||||
task:
|
task:
|
||||||
|
@ -298,7 +294,6 @@ task:
|
||||||
labels:
|
labels:
|
||||||
type: lunar # Must use the lunar-specific worker (needed for USDT functional tests)
|
type: lunar # Must use the lunar-specific worker (needed for USDT functional tests)
|
||||||
env:
|
env:
|
||||||
<< : *PERSISTENT_WORKER_TEMPLATE_ENV
|
|
||||||
FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
|
FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
|
||||||
|
|
||||||
task:
|
task:
|
||||||
|
|
Loading…
Add table
Reference in a new issue