Skip to content

Commit 0242b96

Browse files
authored
Update configurations for Mac builders as well as comment descriptions for a few bots. (#585)
Update descriptions for several bots that were no longer accurate. Also remove jobs properties on two of the MacOS builders to not be hardcoded.
1 parent 408be8a commit 0242b96

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

buildbot/osuosl/master/config/workers.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -327,29 +327,30 @@ def get_all():
327327

328328
# Ubuntu 22.04 on AWS, x86_64 PS4 target
329329
create_worker("sie-linux-worker", properties={'jobs': 40}, max_builds=1),
330-
# 2012 Mac Mini host, 16GB memory:
331-
# - Ubuntu 18.04 in docker container
330+
# Ubuntu 20.04 in docker container on AWS
332331
create_worker("doug-worker-1a", properties={'jobs': 8}, max_builds=1),
333-
# - Ubuntu 22.04 in docker container
332+
# Ubuntu 22.04 in docker container on 2012 Mac Mini
334333
create_worker("doug-worker-1b", properties={'jobs': 8}, max_builds=1),
335334
# Ubuntu 18.04 in docker container on Ryzen 4800U
336335
create_worker("doug-worker-2a", properties={'jobs': 16}, max_builds=1),
337-
# Ubuntu 20.04 on AWS, AMD EPYC 7R13 shared
336+
# Ubuntu 22.04 on AWS
338337
create_worker("sie-linux-worker2", max_builds=1),
338+
# Ubuntu 20.04 on AWS
339339
create_worker("sie-linux-worker3", max_builds=1),
340340
# Ubuntu 22.04 on AWS, x86_64 PS5 target
341341
create_worker("sie-linux-worker4", properties={'jobs': 40}, max_builds=1),
342-
# Ubuntu 22.04 on AWS
342+
# Ubuntu 24.04 on AWS
343343
create_worker("sie-linux-worker5", max_builds=1),
344344

345345
# Windows Server 2019 on AWS, x86_64 PS4 target
346346
create_worker("sie-win-worker", properties={'jobs': 64}, max_builds=1),
347347

348348
# Mac target, Intel Core i7-8700B, 64GB
349349
create_worker("doug-worker-3", properties={'jobs': 12}, max_builds=1),
350+
# Mac target, Apple M2 Pro, 32GB
351+
create_worker("doug-worker-4", max_builds=1),
350352
# Mac target, Apple M1, 16GB
351-
create_worker("doug-worker-4", properties={'jobs': 8}, max_builds=1),
352-
create_worker("doug-worker-5", properties={'jobs': 8}, max_builds=1),
353+
create_worker("doug-worker-5", max_builds=1),
353354

354355
# Ubuntu 20.04, AMD Ryzen 5 PRO 3400GE, 32GB
355356
create_worker("doug-worker-6", properties={'jobs': 8}, max_builds=1),

0 commit comments

Comments
 (0)