Skip to content

Commit faaa079

Browse files
author
MarcoFalke
committed
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.
1 parent fa1d895 commit faaa079

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

.cirrus.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ env: # Global defaults
1111
cirrus_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
@@ -51,8 +48,6 @@ persistent_worker_template_env: &PERSISTENT_WORKER_TEMPLATE_ENV
5148
# - medium: For an x86_64 machine, recommended to have 4 CPUs and 16 GB of memory.
5249
# - 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.
5350
# - arm64: For an aarch64 machine, recommended to have 2 CPUs and 8 GB of memory.
54-
persistent_worker_template: &PERSISTENT_WORKER_TEMPLATE
55-
persistent_worker: {} # Only use this if the task does not care about the type at all
5651

5752
# https://cirrus-ci.org/guide/tips-and-tricks/#sharing-configuration-between-tasks
5853
filter_template: &FILTER_TEMPLATE
@@ -259,9 +254,10 @@ task:
259254
previous_releases_cache:
260255
folder: "releases"
261256
<< : *GLOBAL_TASK_TEMPLATE
262-
<< : *PERSISTENT_WORKER_TEMPLATE
257+
persistent_worker:
258+
labels:
259+
type: small
263260
env:
264-
<< : *PERSISTENT_WORKER_TEMPLATE_ENV
265261
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
266262

267263
task:
@@ -298,7 +294,6 @@ task:
298294
labels:
299295
type: lunar # Must use the lunar-specific worker (needed for USDT functional tests)
300296
env:
301-
<< : *PERSISTENT_WORKER_TEMPLATE_ENV
302297
FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
303298

304299
task:

0 commit comments

Comments
 (0)