Skip to content

Commit 9757dbd

Browse files
authored
chore(ubuntu): Ubuntu 24.04 L3 Image (mozilla-releng#605)
1 parent 1da8aeb commit 9757dbd

File tree

2 files changed

+67
-4
lines changed

2 files changed

+67
-4
lines changed

worker-images.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,12 @@ relsre-gw-fxci-gcp-2404-amd64-alpha:
8686
ubuntu-2404-headless-alpha:
8787
## alpha pool that relsre can use to rebuild and test 2404 headless ubuntu images
8888
fxci-level1-gcp: projects/taskcluster-imaging/global/images/gw-fxci-gcp-l1-2404-amd64-headless-googlecompute-alpha
89+
fxci-level3-gcp: projects/fxci-production-level3-workers/global/images/gw-fxci-gcp-l3-2404-amd64-headless-googlecompute-alpha
90+
8991
ubuntu-2404-headless:
9092
## Headless Image for Ubuntu 24.04
9193
fxci-level1-gcp: projects/taskcluster-imaging/global/images/gw-fxci-gcp-l1-2404-amd64-headless-googlecompute-2025-10-13
94+
fxci-level3-gcp: projects/fxci-production-level3-workers/global/images/gw-fxci-gcp-l3-2404-amd64-headless-googlecompute-2025-10-27
9295

9396
ubuntu-2404-headless-alpha-tc:
9497
## alpha pool that tc can use to rebuild and test 2404 headless ubuntu images

worker-pools.yml

Lines changed: 64 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,11 @@ worker-defaults:
129129
wstAudience: firefoxcitc
130130
generic-worker/linux-d2g:
131131
genericWorker:
132-
config:
132+
config: &gw-config-d2g
133133
cleanUpTaskDirs: true
134134
disableReboots: false
135135
ed25519SigningKeyLocation: '/etc/generic-worker/ed25519_key'
136+
enableRunTaskAsCurrentUser: false
136137
idleTimeoutSecs: 300 # 5 minutes
137138
livelogExecutable: /usr/local/bin/livelog
138139
numberOfTasksToRun: 0
@@ -144,9 +145,27 @@ worker-defaults:
144145
wstAudience: firefoxcitc
145146
d2gConfig:
146147
enableD2G: true
148+
allowGPUs: false
149+
allowHostSharedMemory: false
150+
allowInteractive: true
151+
allowKVM: false
152+
allowLoopbackAudio: true
153+
allowLoopbackVideo: false
147154
allowPrivileged: false
155+
generic-worker/linux-d2g-trusted:
156+
genericWorker:
157+
config:
158+
<<: *gw-config-d2g
159+
d2gConfig:
160+
enableD2G: true
161+
allowGPUs: false
148162
allowHostSharedMemory: false
163+
allowInteractive: false
149164
allowKVM: false
165+
allowLoopbackAudio: false
166+
allowLoopbackVideo: false
167+
allowPrivileged: false
168+
enableInteractive: false
150169

151170
meta:
152171
- &default-gcp-regions [us-central1, us-west1]
@@ -426,17 +445,22 @@ pools:
426445
email_on_error: true
427446
variants:
428447
- pool-group: gecko-1
429-
provider_id: fxci-level1-gcp
448+
chain-of-trust: ''
449+
- pool-group: gecko-3
450+
chain-of-trust: trusted
451+
provider_id:
452+
by-chain-of-trust:
453+
trusted: fxci-level3-gcp
454+
default: fxci-level1-gcp
430455
config:
431456
minCapacity: 0
432457
maxCapacity: 50
433458
regions: *default-gcp-regions
434459
image: ubuntu-2404-headless-alpha
435-
implementation: generic-worker/linux-d2g
460+
implementation: generic-worker/linux-d2g-{chain-of-trust}
436461
worker-config:
437462
genericWorker:
438463
config:
439-
enableInteractive: true
440464
headlessTasks: true
441465
downloadsDir: /home/generic-worker/downloads
442466
cachesDir: /home/generic-worker/caches
@@ -993,6 +1017,42 @@ pools:
9931017
by-pool-group:
9941018
gecko-[13]: 600
9951019
default: 120
1020+
- pool_id: '{pool-group}/decision'
1021+
description: Worker for Firefox automation
1022+
1023+
email_on_error: false
1024+
provider_id:
1025+
by-chain-of-trust:
1026+
trusted: fxci-level3-gcp
1027+
default: fxci-level1-gcp
1028+
variants:
1029+
- pool-group: gecko-1
1030+
chain-of-trust: ''
1031+
- pool-group: gecko-2
1032+
chain-of-trust: ''
1033+
- pool-group: gecko-3
1034+
chain-of-trust: trusted
1035+
config:
1036+
worker-config:
1037+
genericWorker:
1038+
config:
1039+
headlessTasks: true
1040+
disableNativePayloads: true
1041+
downloadsDir: /home/generic-worker/downloads
1042+
cachesDir: /home/generic-worker/caches
1043+
implementation: generic-worker/linux-d2g-{chain-of-trust}
1044+
image: ubuntu-2404-headless
1045+
minCapacity:
1046+
by-pool-group:
1047+
gecko-[13]: 1
1048+
default: 0
1049+
maxCapacity:
1050+
by-pool-group:
1051+
gecko-1: 40
1052+
gecko-3: 20
1053+
default: 4
1054+
regions: *default-gcp-regions
1055+
instance_types: [*c4d-standard-8]
9961056
- pool_id: '{pool-group}/decision-gcp-{suffix}-amd-bug1990935'
9971057
description: Decision task worker
9981058

0 commit comments

Comments
 (0)