[PATCH] Add new osuosl arm64 worker and move gcc and glibc builders

[PATCH] Add new osuosl arm64 worker and move gcc and glibc builders

[Mark Wielaard]

---
 buildbot.config.sample |  1 +
 builder/master.cfg     | 41 +++++++++++++++++++++++++----------------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/buildbot.config.sample b/buildbot.config.sample
index d61fb56..8befa77 100644
--- a/buildbot.config.sample
+++ b/buildbot.config.sample
@@ -25,6 +25,7 @@ ubuntu22_04-armhf=frob
 fedora-arm64=frob
 gentoo-sparc=frob
 gentoo-sparc-big=frob
+osuosl-debian-arm64=frob
 
 # Users
 bb_admin=frob
diff --git a/builder/master.cfg b/builder/master.cfg
index 0c5ce5b..681d9cc 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -270,12 +270,21 @@ c['workers'].append(ibm_power10_worker)
 
 # 8 core arm64 server hosted by osuosl
 fedora_arm64_worker = worker.Worker("fedora-arm64",
-                                         getpw("fedora-arm64"),
-                                         max_builds=2,
-                                         properties={'ncpus': 6, 'maxcpus': 8},
-                                         notify_on_missing=['mark@klomp.org']);
+                                    getpw("fedora-arm64"),
+                                    max_builds=2,
+                                    properties={'ncpus': 4, 'maxcpus': 8},
+                                    notify_on_missing=['mark@klomp.org']);
 c['workers'].append(fedora_arm64_worker)
 
+# 16 core arm64 server hosted by osuosl
+osuosl_debian_arm64_worker = worker.Worker("osuosl-debian-arm64",
+                                           getpw("osuosl-debian-arm64"),
+                                           max_builds=1,
+                                           properties={'ncpus': 8,
+                                                       'maxcpus': 16},
+                                           notify_on_missing=['mark@klomp.org']);
+c['workers'].append(osuosl_debian_arm64_worker)
+
 # 'protocols' contains information about protocols which master will use for
 # communicating with workers. You must define at least 'port' option that workers
 # could connect to your master with this protocol.
@@ -923,7 +932,7 @@ gcc_build_scheduler = schedulers.SingleBranchScheduler(
         reason="gcc project master branch update",
         builderNames=["gcc-fedora-x86_64",
                       "gcc-fedora-mingw",
-                      "gcc-fedora-arm64",
+                      "gcc-debian-arm64",
                       "gcc-gentoo-sparc",
                       "gcc-rawhide-x86_64",
                       "gcc-debian-testing-x86_64",
@@ -944,7 +953,7 @@ glibc_scheduler = schedulers.AnyBranchScheduler(
         reason="glibc project release branch update",
         builderNames=["glibc-fedrawhide-x86_64",
                       "glibc-fedora-x86_64",
-                      "glibc-fedora-arm64"])
+                      "glibc-debian-arm64"])
 c['schedulers'].append(glibc_scheduler)
 
 # Quick build only scheduler
@@ -3363,13 +3372,13 @@ gcc_fedora_x86_64_builder = util.BuilderConfig(
         factory=gcc_build_factory)
 c['builders'].append(gcc_fedora_x86_64_builder)
 
-gcc_fedora_arm64_builder = util.BuilderConfig(
-        name="gcc-fedora-arm64",
+gcc_osuosl_debian_arm64_builder = util.BuilderConfig(
+        name="gcc-debian-arm64",
         collapseRequests=True,
-        workernames=["fedora-arm64"],
-        tags=["gcc", "fedora", "arm64"],
+        workernames=["osuosl-debian-arm64"],
+        tags=["gcc", "debian", "arm64"],
         factory=gcc_build_factory)
-c['builders'].append(gcc_fedora_arm64_builder)
+c['builders'].append(gcc_osuosl_debian_arm64_builder)
 
 gcc_gentoo_sparc_builder = util.BuilderConfig(
         name="gcc-gentoo-sparc",
@@ -3622,13 +3631,13 @@ glibc_fedora_x86_64_builder = util.BuilderConfig(
         factory=glibc_factory)
 c['builders'].append(glibc_fedora_x86_64_builder)
 
-glibc_fedora_arm64_builder = util.BuilderConfig(
-        name="glibc-fedora-arm64",
+glibc_osuosl_debian_arm64_builder = util.BuilderConfig(
+        name="glibc-debian-arm64",
         collapseRequests=True,
-        workernames="fedora-arm64",
-        tags=["glibc", "fedora", "arm64"],
+        workernames="osuosl-debian-arm64",
+        tags=["glibc", "debian", "arm64"],
         factory=glibc_factory)
-c['builders'].append(glibc_fedora_arm64_builder)
+c['builders'].append(glibc_osuosl_debian_arm64_builder)
 
 glibc_debian_i386_builder = util.BuilderConfig(
         name="glibc-debian-i386",
-- 
2.39.3