Derive builddir from tags when sharing a builder between workers

Author: zware

master/master.cfg

@@ -239,8 +239,14 @@ for branch_num, (git_url, branchname, git_branch) in enumerate(git_branches):
         worker_name = worker_names
         if isinstance(worker_names, tuple):
             worker_name = worker_names[0]
+            lambda: '-'.join(sorted(tags))
         else:
             worker_names = (worker_names,)
+            builddir=lambda: "%s.%s%s" % (
+                branchname,
+                worker_name,
+                getattr(f, "buildersuffix", ""),
+            )
         if any(
             pattern in name for pattern in ONLY_MAIN_BRANCH
         ) and branchname != MAIN_BRANCH_NAME:
@@ -304,8 +310,7 @@ for branch_num, (git_url, branchname, git_branch) in enumerate(git_branches):
         builder = util.BuilderConfig(
             name=buildername,
             workernames=list(worker_names),
-            builddir="%s.%s%s"
-            % (branchname, worker_name, getattr(f, "buildersuffix", "")),
+            builddir=builddir(),
             factory=f,
             tags=tags,
             locks=[cpulock.access("counting")],
@@ -354,8 +359,14 @@ for name, worker_names, buildfactory, stability, tier in BUILDERS:
     worker_name = worker_names
     if isinstance(worker_names, tuple):
         worker_name = worker_names[0]
+        builddir = lambda: '-'.join(sorted(tags))
     else:
         worker_names = (worker_names,)
+        builddir = lambda: "%s.%s%s" % (
+            "pull_request",
+            worker_name,
+            getattr(f, "buildersuffix", ""),
+        )
     buildername = f"{name} PR"
     all_pull_request_builders.append(buildername)
     if stability == STABLE:
@@ -380,8 +391,7 @@ for name, worker_names, buildfactory, stability, tier in BUILDERS:
     builder = util.BuilderConfig(
         name=buildername,
         workernames=list(worker_names),
-        builddir="%s.%s%s"
-        % ("pull_request", worker_name, getattr(f, "buildersuffix", "")),
+        builddir=builddir(),
         factory=f,
         tags=tags,
         locks=[cpulock.access("counting")],