public inbox for buildbot@sourceware.org
 help / color / mirror / Atom feed
* [COMMITTED] Add a second debian-i386 worker, binutils and gdb builders
@ 2022-06-15  0:12 Mark Wielaard
  0 siblings, 0 replies; only message in thread
From: Mark Wielaard @ 2022-06-15  0:12 UTC (permalink / raw)
  To: buildbot; +Cc: Mark Wielaard

The fedora-x86 and debian-amd64 workers have been moved to the
container worker. That provides more vcpus and memory for
centos-x86_64. And allows a second debian-i386 worker.

Add i386 builders for binutils and gdb.
---
 buildbot.config.sample |  3 +--
 builder/master.cfg     | 42 +++++++++++++++++++++++++++++++++---------
 htdocs/index.html      |  4 ++++
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/buildbot.config.sample b/buildbot.config.sample
index 5c9335e..deba731 100644
--- a/buildbot.config.sample
+++ b/buildbot.config.sample
@@ -6,9 +6,8 @@
 sourceware=frob
 centos-x86_64=frob
 debian-arm64=frob
-fedora-x86_64=frob
-debian-amd64=frob
 debian-i386=frob
+debian-i386-2=frob
 debian-armhf=frob
 fedora-s390x=frob
 fedora-ppc64le=frob
diff --git a/builder/master.cfg b/builder/master.cfg
index d1e169b..8455dfe 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -56,11 +56,11 @@ sourceware_worker = worker.Worker("sourceware",
                                   notify_on_missing="buildbot@sourceware.org")
 c['workers'].append(sourceware_worker)
 
-# 2 libvirt workers on shared Intel Core i7-7700 machine
+# 3 libvirt workers on shared Intel Core i7-7700 machine
 centos_x86_64_worker = worker.Worker("centos-x86_64",
                                      getpw("centos-x86_64"),
                                      max_builds=1,
-                                     properties={'ncpus': 4},
+                                     properties={'ncpus': 8},
                                      notify_on_missing='mark@klomp.org');
 c['workers'].append(centos_x86_64_worker)
 debian_i386_worker = worker.Worker("debian-i386",
@@ -69,6 +69,14 @@ debian_i386_worker = worker.Worker("debian-i386",
                                    properties={'ncpus': 4},
                                    notify_on_missing='mark@klomp.org');
 c['workers'].append(debian_i386_worker)
+debian_i386_2_worker = worker.Worker("debian-i386-2",
+                                   getpw("debian-i386-2"),
+                                   max_builds=1,
+                                   properties={'ncpus': 4},
+                                   notify_on_missing='mark@klomp.org');
+c['workers'].append(debian_i386_2_worker)
+
+debian_i386_workers = ['debian-i386', 'debian-i386-2']
 
 # armv7l board Rockchip RK3288 Asus Tinker Board S, 2GB memory
 debian_armhf_worker = worker.Worker("debian-armhf",
@@ -433,6 +441,7 @@ binutils_scheduler = schedulers.SingleBranchScheduler(
                       "binutils-debian-ppc64",
                       "binutils-debian-armhf",
                       "binutils-debian-arm64",
+                      "binutils-debian-i386",
                       "binutils-fedora-ppc64le",
                       "binutils-opensusetw-x86_64",
                       "binutils-opensuseleap-x86_64"])
@@ -476,6 +485,7 @@ gdb_scheduler = schedulers.SingleBranchScheduler(
                       "gdb-fedora-x86_64",
                       "gdb-debian-armhf",
                       "gdb-debian-arm64",
+                      "gdb-debian-i386",
                       "gdb-fedora-s390x",
                       "gdb-debian-ppc64",
                       "gdb-fedora-ppc64le",
@@ -696,7 +706,7 @@ c['builders'].append(bzip2_debian_armhf_builder)
 
 bzip2_debian_i386_builder = util.BuilderConfig(
         name="bzip2-debian-i386",
-        workernames=["debian-i386"],
+        workernames=debian_i386_workers,
         tags=["bzip2", "debian", "i386"],
         factory=bzip2_factory)
 c['builders'].append(bzip2_debian_i386_builder)
@@ -805,7 +815,7 @@ c['builders'].append(debugedit_debian_armhf_builder)
 
 debugedit_debian_i386_builder = util.BuilderConfig(
         name="debugedit-debian-i386",
-        workernames=["debian-i386"],
+        workernames=debian_i386_workers,
         tags=["debugedit", "debian", "i386"],
         factory=debugedit_factory)
 c['builders'].append(debugedit_debian_i386_builder)
@@ -912,7 +922,7 @@ c['builders'].append(dwz_debian_armhf_builder)
 
 dwz_debian_i386_builder = util.BuilderConfig(
         name="dwz-debian-i386",
-        workernames=["debian-i386"],
+        workernames=debian_i386_workers,
         tags=["dwz", "debian", "i386"],
         factory=dwz_factory)
 c['builders'].append(dwz_debian_i386_builder)
@@ -1111,7 +1121,7 @@ c['builders'].append(elfutils_debian_armhf_builder)
 
 elfutils_debian_i386_builder = util.BuilderConfig(
         name="elfutils-debian-i386",
-        workernames=["debian-i386"],
+        workernames=debian_i386_workers,
         tags=["elfutils", "debian", "i386"],
         factory=elfutils_factory_mua)
 c['builders'].append(elfutils_debian_i386_builder)
@@ -1214,7 +1224,7 @@ c['builders'].append(gccrust_fedora_x86_64_builder)
 
 gccrust_debian_i386_builder = util.BuilderConfig(
         name="gccrust-debian-i386",
-        workernames=["debian-i386"],
+        workernames=debian_i386_workers,
         tags=["gccrust", "debian", "i386"],
         factory=gccrust_factory)
 c['builders'].append(gccrust_debian_i386_builder)
@@ -1383,6 +1393,13 @@ binutils_debian_arm64_builder = util.BuilderConfig(
         factory=binutils_factory)
 c['builders'].append(binutils_debian_arm64_builder)
 
+binutils_debian_i386_builder = util.BuilderConfig(
+	name="binutils-debian-i386",
+        workernames=debian_i386_workers,
+        tags=["binutils", "debian", "i386"],
+        factory=binutils_factory)
+c['builders'].append(binutils_debian_i386_builder)
+
 binutils_fedora_ppc64le_builder = util.BuilderConfig(
 	name="binutils-fedora-ppc64le",
         workernames=["fedora-ppc64le"],
@@ -1546,6 +1563,13 @@ gdb_debian_arm64_builder = util.BuilderConfig(
         factory=gdb_factory)
 c['builders'].append(gdb_debian_arm64_builder)
 
+gdb_debian_i386_builder = util.BuilderConfig(
+	name="gdb-debian-i386",
+        workernames=debian_i386_workers,
+        tags=["gdb", "debian", "i386"],
+        factory=gdb_factory)
+c['builders'].append(gdb_debian_i386_builder)
+
 gdb_fedora_s390x_builder = util.BuilderConfig(
 	name="gdb-fedora-s390x",
         workernames=["fedora-s390x"],
@@ -1773,7 +1797,7 @@ c['builders'].append(libabigail_debian_amd64_builder)
 
 libabigail_debian_i386_builder = util.BuilderConfig(
         name="libabigail-debian-i386",
-        workernames=["debian-i386"],
+        workernames=debian_i386_workers,
         tags=["libabigail", "debian", "i386"],
         factory=libabigail_factory_checkonly)
 c['builders'].append(libabigail_debian_i386_builder)
@@ -1884,7 +1908,7 @@ c['builders'].append(valgrind_debian_arm64_builder)
 
 valgrind_debian_i386_builder = util.BuilderConfig(
         name="valgrind-debian-i386",
-        workernames=["debian-i386"],
+        workernames=debian_i386_workers,
         tags=["valgrind", "debian", "i386"],
         factory=valgrind_make_check_aux_factory)
 c['builders'].append(valgrind_debian_i386_builder)
diff --git a/htdocs/index.html b/htdocs/index.html
index 8837cd1..a4df826 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -49,6 +49,8 @@
               <img src="/buildbot/badges/binutils-debian-armhf.svg"></a></td>
 	  <td><a href="/buildbot/#builders/binutils-debian-arm64">debian-arm64<br>
               <img src="/buildbot/badges/binutils-debian-arm64.svg"></a></td>
+	  <td><a href="/buildbot/#builders/binutils-debian-i386">debian-i386<br>
+              <img src="/buildbot/badges/binutils-debian-i386.svg"></a></td>
 	  <td><a href="/buildbot/#builders/binutils-fedora-ppc64le">fedora-ppc64le<br>
               <img src="/buildbot/badges/binutils-fedora-ppc64le.svg"></a></td>
 	  <td><a href="/buildbot/#builders/binutils-opensusetw-x86_64">opensusetw-x86_64<br>
@@ -187,6 +189,8 @@
               <img src="/buildbot/badges/gdb-debian-armhf.svg"></a></td>
 	  <td><a href="/buildbot/#builders/gdb-debian-arm64">debian-arm64<br>
               <img src="/buildbot/badges/gdb-debian-arm64.svg"></a></td>
+	  <td><a href="/buildbot/#builders/gdb-debian-i386">debian-i386<br>
+              <img src="/buildbot/badges/gdb-debian-i386.svg"></a></td>
 	  <td><a href="/buildbot/#builders/gdb-fedora-s390x">fedora-s390x<br>
               <img src="/buildbot/badges/gdb-fedora-s390x.svg"></a></td>
 	  <td><a href="/buildbot/#builders/gdb-debian-ppc64">debian-ppc64<br>
-- 
2.30.2


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-06-15  0:12 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-15  0:12 [COMMITTED] Add a second debian-i386 worker, binutils and gdb builders Mark Wielaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).