[PATCH] Remove leap and tumblewood x86_64 gcc/gccrust container builders

[PATCH] Remove leap and tumblewood x86_64 gcc/gccrust container builders

[Mark Wielaard]

We already have a lot of x86_64 gcc container builders (fedora, rawhide,
debian debian-testing and a full debian amd64 builder, plus a fedora
mingw builder). Each gcc builder uses a couple of GB of disk on each
container worker. Removing these 4 builders frees up ~10GB per worker.
---
 builder/master.cfg | 46 ++--------------------------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

diff --git a/builder/master.cfg b/builder/master.cfg
index 8077514..04c54da 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -761,9 +761,7 @@ gccrust_scheduler = schedulers.SingleBranchScheduler(
                       "gccrust-gentoo-sparc",
                       "gccrust-fedora-ppc64le",
                       "gccrust-fedora-s390x",
-                      "gccrust-debian-ppc64",
-                      "gccrust-opensusetw-x86_64",
-                      "gccrust-opensuseleap-x86_64"])
+                      "gccrust-debian-ppc64"])
 c['schedulers'].append(gccrust_scheduler)
 
 gccrust_bootstrap_scheduler = schedulers.SingleBranchScheduler(
@@ -962,10 +960,8 @@ gcc_build_scheduler = schedulers.SingleBranchScheduler(
                       "gcc-debian-amd64",
                       "gcc-debian-i386",
                       "gcc-fedora-ppc64le",
-                      "gcc-fedora-s390x",
 #                      "gcc-debian-ppc64",
-                      "gcc-opensusetw-x86_64",
-                      "gcc-opensuseleap-x86_64"])
+                      "gcc-fedora-s390x"])
 c['schedulers'].append(gcc_build_scheduler)
 
 glibc_scheduler = schedulers.AnyBranchScheduler(
@@ -2429,24 +2425,6 @@ gccrust_debian_ppc64_builder = util.BuilderConfig(
         factory=gccrust_factory)
 c['builders'].append(gccrust_debian_ppc64_builder)
 
-gccrust_opensusetw_x86_64_builder = util.BuilderConfig(
-        name="gccrust-opensusetw-x86_64",
-	properties={'container-file':
-		    readContainerFile('opensuse-tumbleweed')},
-	workernames=vm_workers,
-        tags=["gccrust", "opensusetw", "x86_64"],
-        factory=gccrust_factory)
-c['builders'].append(gccrust_opensusetw_x86_64_builder)
-
-gccrust_opensuseleap_x86_64_builder = util.BuilderConfig(
-        name="gccrust-opensuseleap-x86_64",
-	properties={'container-file':
-		    readContainerFile('opensuse-leap')},
-	workernames=vm_workers,
-        tags=["gccrust", "opensuseleap", "x86_64"],
-        factory=gccrust_factory)
-c['builders'].append(gccrust_opensuseleap_x86_64_builder)
-
 gccrust_rawhide_x86_64_builder = util.BuilderConfig(
         name="gccrust-rawhide-x86_64",
 	properties={'container-file':
@@ -3567,26 +3545,6 @@ gcc_fedora_ppc64le_builder = util.BuilderConfig(
         factory=gcc_build_factory)
 c['builders'].append(gcc_fedora_ppc64le_builder)
 
-gcc_opensusetw_x86_64_builder = util.BuilderConfig(
-        name="gcc-opensusetw-x86_64",
-        collapseRequests=True,
-        properties={'container-file':
-                    readContainerFile('opensuse-tumbleweed')},
-        workernames=vm_workers,
-        tags=["gcc", "opensusetw", "x86_64"],
-        factory=gcc_build_factory)
-c['builders'].append(gcc_opensusetw_x86_64_builder)
-
-gcc_opensuseleap_x86_64_builder = util.BuilderConfig(
-        name="gcc-opensuseleap-x86_64",
-        collapseRequests=True,
-        properties={'container-file':
-                    readContainerFile('opensuse-leap')},
-        workernames=vm_workers,
-        tags=["gcc", "opensuseleap", "x86_64"],
-        factory=gcc_build_factory)
-c['builders'].append(gcc_opensuseleap_x86_64_builder)
-
 gcc_rawhide_x86_64_builder = util.BuilderConfig(
         name="gcc-rawhide-x86_64",
         collapseRequests=True,
-- 
2.39.3