Clean up buildbot list

halide · Feb 1, 2024 · 69e5493 · 69e5493
1 parent efe5c4a
commit 69e5493
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/master/master.cfg b/master/master.cfg
@@ -129,29 +129,21 @@ _NPROC = Interpolate("%(worker:numcpus)s")
 _NPROC_PLUS_2 = Transform(lambda x: f'{int(x) + 2}', _NPROC)
 
 _WORKERS = [
+    # OrangePi5+ test bots: 8 cores, can run 32 or 64
+    ('arm64-linux-worker-3', WorkerConfig(max_builds=2, j=_NPROC, arch='arm', bits=[32, 64], os='linux')),
+    ('arm64-linux-worker-4', WorkerConfig(max_builds=2, j=_NPROC, arch='arm', bits=[32, 64], os='linux')),
+
     ('linux-worker-1', WorkerConfig(max_builds=4, j=8, arch='x86', bits=[32, 64], os='linux')),
     ('linux-worker-4', WorkerConfig(max_builds=4, j=8, arch='x86', bits=[32, 64], os='linux')),
+
+    # Mac Mini ???
+    ('mac-arm-worker-1', WorkerConfig(max_builds=2, j=8, arch='arm', bits=[64], os='osx')),
     # Mac Mini 2018, 3.2 GHz 6-Core Intel Core i7, 16GB memory
     ('mac-x86-worker-2', WorkerConfig(max_builds=2, j=8, arch='x86', bits=[64], os='osx')),
     # Mac Mini 2018, ??? details TBD
     ('mac-x86-worker-3', WorkerConfig(max_builds=2, j=8, arch='x86', bits=[64], os='osx')),
-    ('mac-arm-worker-1', WorkerConfig(max_builds=2, j=8, arch='arm', bits=[64], os='osx')),
-
-    # The arm-linux bots here have 4 cores but apparently don't have enough RAM to do more
-    # than -j=2 without crashing during LLVM builds.
-    # ('arm32-linux-worker-1', WorkerConfig(max_builds=1, j=2, arch='arm', bits=[32], os='linux')),
-    # ('arm32-linux-worker-2', WorkerConfig(max_builds=1, j=2, arch='arm', bits=[32], os='linux')),
-    # ('arm64-linux-worker-1', WorkerConfig(max_builds=1, j=2, arch='arm', bits=[64], os='linux')),
-    # ('arm64-linux-worker-2', WorkerConfig(max_builds=1, j=2, arch='arm', bits=[64], os='linux')),
-
-    # The rpi4 has 8GB ram, so apparently it's OK with -j=nproc for now.
-    # ('rpi4-linux-worker-1', WorkerConfig(max_builds=1, j=_NPROC, arch='arm', bits=[32], os='linux')),
-
-    # OrangePi5+ test bots: 8 cores, can run 32 or 64
-    ('arm64-linux-worker-3', WorkerConfig(max_builds=2, j=_NPROC, arch='arm', bits=[32, 64], os='linux')),
-    ('arm64-linux-worker-4', WorkerConfig(max_builds=2, j=_NPROC, arch='arm', bits=[32, 64], os='linux')),
 
-    ('win-worker-3', WorkerConfig(max_builds=2, j=8, arch='x86', bits=[32, 64], os='windows')),
+    ('win-worker-3', WorkerConfig(max_builds=1, j=_NPROC_PLUS_2, arch='x86', bits=[32, 64], os='windows')),
     ('win-worker-4', WorkerConfig(max_builds=1, j=_NPROC_PLUS_2, arch='x86', bits=[32, 64], os='windows')),
 ]