Migrate extra_factory_args to worker configuration

Author: zware

master/custom/workers.py

@@ -30,15 +30,15 @@ def __init__(
         not_branches=None,
         parallel_builders=None,
         parallel_tests=None,
-        exclude_test_resources=None,
+        extra_factory_args=None,
     ):
         self.name = name
         self.tags = tags or set()
         self.branches = branches
         self.not_branches = not_branches
         self.parallel_builders = parallel_builders
         self.parallel_tests = parallel_tests
-        self.exclude_test_resources = exclude_test_resources
+        self.extra_factory_args = extra_factory_args or {}
         worker_settings = settings.workers[name]
         owner = name.split("-")[0]
         owner_settings = settings.owners[owner]
@@ -124,6 +124,10 @@ def get_workers(settings):
             tags=['linux', 'unix', 'rhel', 'ppc64le'],
             parallel_tests=10,
             branches=['3.10', '3.11', '3.12'],
+            extra_factory_args={
+                # Increase the timeout on this slow worker
+                "timeout_factor": 2,
+            },
         ),
         cpw(
             name="cstratak-CentOS9-ppc64le",
@@ -199,7 +203,9 @@ def get_workers(settings):
             # Tests fail with latin1 encoding on 3.12, probably earlier
             not_branches=['3.12', '3.11', '3.10'],
             # Problematic ISP causes issues connecting to testpython.net
-            exclude_test_resources=['urlfetch', 'network'],
+            extra_factory_args=dict(
+                exclude_test_resources=['urlfetch', 'network'],
+            ),
         ),
         cpw(
             name="savannah-raspbian",
@@ -216,21 +222,27 @@ def get_workers(settings):
             name="pablogsal-arch-x86_64",
             tags=['linux', 'unix', 'arch', 'amd64', 'x86-64'],
             # Problematic ISP causes issues connecting to testpython.net
-            exclude_test_resources=['urlfetch', 'network'],
+            extra_factory_args=dict(
+                exclude_test_resources=['urlfetch', 'network'],
+            ),
         ),
         cpw(
             name="pablogsal-macos-m1",
             tags=['macOS', 'unix', 'arm', 'arm64'],
             parallel_tests=4,
             # Problematic ISP causes issues connecting to testpython.net
-            exclude_test_resources=['urlfetch', 'network'],
+            extra_factory_args=dict(
+                exclude_test_resources=['urlfetch', 'network'],
+            ),
         ),
         cpw(
             name="pablogsal-rasp",
             tags=['linux', 'unix', 'raspbian', 'debian', 'arm'],
             parallel_tests=1,  # Reduced from 2: ASAN builds use 2-10x more memory
             # Problematic ISP causes issues connecting to testpython.net
-            exclude_test_resources=['urlfetch', 'network'],
+            extra_factory_args=dict(
+                exclude_test_resources=['urlfetch', 'network'],
+            ),
         ),
         cpw(
             name="skumaran-ubuntu-x86_64",
@@ -283,6 +295,10 @@ def get_workers(settings):
             not_branches=['3.10'],
             parallel_tests=2,
             parallel_builders=2,
+            extra_factory_args={
+                # Increase the timeout on this slow worker
+                "timeout_factor": 2,
+            },
         ),
         cpw(
             name="ambv-bb-win11",

master/master.cfg

@@ -154,24 +154,6 @@ c["builders"] = []
 c["schedulers"] = []
 
 parallel = {w.name: f"-j{w.parallel_tests}" for w in WORKERS if w.parallel_tests}
-extra_factory_args = {
-    "cstratak-RHEL8-ppc64le": {
-        # Increase the timeout on this slow worker
-        "timeout_factor": 2,
-    },
-    "bcannon-wasi": {
-        # Increase the timeout on this slow worker
-        "timeout_factor": 2,
-    },
-
-}
-
-# Build factory args from worker properties
-for w in WORKERS:
-    if w.exclude_test_resources:
-        if w.name not in extra_factory_args:
-            extra_factory_args[w.name] = {}
-        extra_factory_args[w.name]["exclude_test_resources"] = w.exclude_test_resources
 
 # The following with the worker owners' agreement
 cpulock = locks.WorkerLock(
@@ -288,7 +270,7 @@ for branch_num, (git_url, branchname, git_branch) in enumerate(git_branches):
             source,
             parallel=parallel.get(worker_name),
             branch=branchname,
-            **extra_factory_args.get(worker_name, {}),
+            **worker.extra_factory_args,
         )
         tags = [branchname, stability, *getattr(f, "tags", [])]
         if tier:
@@ -389,14 +371,16 @@ for name, worker_name, buildfactory, stability, tier in BUILDERS:
 
     source = GitHub(repourl=git_url, **GIT_KWDS)
 
+    worker = WORKERS_BY_NAME[worker_name]
+
     f = buildfactory(
         source,
         parallel=parallel.get(worker_name),
         # Use the same downstream branch names as the "custom"
         # builder (check what the factories are doing with this
         # parameter for more info).
         branch="3",
-        **extra_factory_args.get(worker_name, {}),
+        **worker.extra_factory_args,
     )
 
     tags = ["PullRequest", stability, *getattr(f, "tags", [])]