[PATCH] Add new big osuosl x86_64 worker

[PATCH] Add new big osuosl x86_64 worker

[Mark Wielaard]

This adds a second x86_64 buildbot worker server provided by OSUOSL.
Dual socket, 6 core Xeon X5650, total of 24 threads, 64G mem, 450G disk.

It will be used as big_vm_worker instead of bbo1-2.
bb01-2 will be used as a "small" vm with reduced number of cores.
---
 builder/master.cfg     | 25 ++++++++++++++++++-------
 htdocs/index.html.post |  2 +-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/builder/master.cfg b/builder/master.cfg
index b50cab6..8077514 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -212,8 +212,8 @@ bb3_worker = worker.DockerLatentWorker("bb3",
                            properties={'ncpus': 6, 'maxcpus': 12});
 c['workers'].append(bb3_worker)
 
-# OSUOSL machine, two latent workers
-# One for "small" fast jobs, one for (slow) large jobs
+# OSUOSL x86_64 machine one, two latent workers
+# Two for "small" fast jobs
 bbo1_1_worker = worker.DockerLatentWorker("bbo1-1",
                            None,
                            masterFQDN="builder.sourceware.org",
@@ -233,9 +233,22 @@ bbo1_2_worker = worker.DockerLatentWorker("bbo1-2",
                            volumes=["/home/builder/shared:/home/builder/shared"],
                            build_wait_timeout=0,
                            max_builds=1,
-                           properties={'ncpus': 8, 'maxcpus': 16});
+                           properties={'ncpus': 8, 'maxcpus': 8});
 c['workers'].append(bbo1_2_worker)
 
+# OSUOSL x86_64 machine one, one latent worker
+# one for (slow) large jobs
+bbo2_worker = worker.DockerLatentWorker("bbo2",
+                           None,
+                           masterFQDN="builder.sourceware.org",
+                           docker_host="ssh://builder@sourceware-builder2.osuosl.org",
+                           dockerfile=util.Interpolate('%(prop:container-file)s'),
+                           volumes=["/home/builder/shared:/home/builder/shared"],
+                           build_wait_timeout=0,
+                           max_builds=1,
+                           properties={'ncpus': 12, 'maxcpus': 24});
+c['workers'].append(bbo2_worker)
+
 # Another OSUOSL machine for producing coverage, doc, manual etc. snapshots
 snapshots_worker = worker.DockerLatentWorker("snapshots",
                         None,
@@ -248,11 +261,9 @@ snapshots_worker = worker.DockerLatentWorker("snapshots",
                         properties={'ncpus': 4, 'maxcpus': 4});
 c['workers'].append(snapshots_worker)
 
-# Note that bbo1-2 is only in the big_vm_workers
-# because it doesn't have enough disk to do all builds.
 vm_workers = ['bb1-1', 'bb1-2', 'bb2-1', 'bb2-2', 'bb3',
-              'bbo1-1']
-big_vm_workers = ['bb3', 'bbo1-2']
+              'bbo1-1', 'bbo1-2', 'bbo2']
+big_vm_workers = ['bb3', 'bbo2']
 
 ibm_power9_worker = worker.Worker("ibm_power9",
                                   getpw("ibm_power9"),
diff --git a/htdocs/index.html.post b/htdocs/index.html.post
index a578713..0df4bad 100644
--- a/htdocs/index.html.post
+++ b/htdocs/index.html.post
@@ -11,7 +11,7 @@
 	  debian-arm64 and debian-armhf workers</li>
 	<li>Frank Eigler for the fedrawhide-x86_64 worker</li>
 	<li>IBM for the ibm_power8, ibm_power9 and ibm_power10 workers</li>
-	<li>OSUOSL for the x86_64 bbo1 and fedora-arm64 workers</li>
+	<li>OSUOSL for the x86_64 bbo1, bbo2 and fedora-arm64 workers</li>
 	<li>OSUOSL for hosting the <a href="https://snapshots.sourceware.org/">snapshots server</a></li>        
 	<li>Gentoo Foundation and OSUOSL for the gentoo-sparc worker</li>
 	<li>Red Hat for the main builder server</li>
-- 
2.39.3