From 8c720f27ab11b4d6700817e3bdb782703a2a6e96 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 29 Sep 2023 15:14:48 +0200 Subject: [PATCH] Remove armhf/arm64 ubuntu20_04/22_04 workers for gcc, binutils and gdb. This removed the arm64-ubuntu22_04, armhf-ubuntu20_04, armhf-ubuntu22_04, ubuntu22_04-arm64 and ubuntu22_04-armhf workers plus the associated builders for gcc, binutils and gdb. --- builder/master.cfg | 131 +---------------------------------------- htdocs/index.html.post | 3 - 2 files changed, 1 insertion(+), 133 deletions(-) diff --git a/builder/master.cfg b/builder/master.cfg index 884a9ea..4ac056a 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -268,53 +268,6 @@ ibm_power10_worker = worker.Worker("ibm_power10", notify_on_missing=['cel@us.ibm.com']); c['workers'].append(ibm_power10_worker) -# Various arm64/armhf workers provided by the Works on Arm initiative -# 4 used for gdb -arm64_ubuntu20_04_worker = worker.Worker("arm64-ubuntu20_04", - getpw("arm64-ubuntu20_04"), - max_builds=1, - properties={'ncpus': 4, 'maxcpus': 4}, - notify_on_missing=['christophe.lyon@arm.com']); -c['workers'].append(arm64_ubuntu20_04_worker) - -arm64_ubuntu22_04_worker = worker.Worker("arm64-ubuntu22_04", - getpw("arm64-ubuntu22_04"), - max_builds=1, - properties={'ncpus': 4, 'maxcpus': 4}, - notify_on_missing=['christophe.lyon@arm.com']); -c['workers'].append(arm64_ubuntu22_04_worker) - -armhf_ubuntu20_04_worker = worker.Worker("armhf-ubuntu20_04", - getpw("armhf-ubuntu20_04"), - max_builds=1, - properties={'ncpus': 4, 'maxcpus': 4}, - notify_on_missing=['christophe.lyon@arm.com']); -c['workers'].append(armhf_ubuntu20_04_worker) - -armhf_ubuntu22_04_worker = worker.Worker("armhf-ubuntu22_04", - getpw("armhf-ubuntu22_04"), - max_builds=1, - properties={'ncpus': 4, 'maxcpus': 4}, - notify_on_missing=['christophe.lyon@arm.com']); -c['workers'].append(armhf_ubuntu22_04_worker) - -# 2 used for gcc -ubuntu20_04_armhf_worker = worker.Worker("ubuntu22_04-armhf", - getpw("ubuntu22_04-armhf"), - properties={'ncpus': 20, - 'maxcpus': 20}, - max_builds=1, - notify_on_missing=['christophe.lyon@arm.com']); -c['workers'].append(ubuntu20_04_armhf_worker) - -ubuntu20_04_arm64_worker = worker.Worker("ubuntu22_04-arm64", - getpw("ubuntu22_04-arm64"), - properties={'ncpus': 20, - 'maxcpus': 20}, - max_builds=1, - notify_on_missing=['christophe.lyon@arm.com']); -c['workers'].append(ubuntu20_04_arm64_worker) - # 8 core arm64 server hosted by osuosl fedora_arm64_worker = worker.Worker("fedora-arm64", getpw("fedora-arm64"), @@ -832,11 +785,7 @@ binutils_scheduler = schedulers.SingleBranchScheduler( "binutils-debian-i386", "binutils-fedora-ppc64le", "binutils-opensusetw-x86_64", - "binutils-opensuseleap-x86_64", - "binutils-ubuntu20_04-armhf", - "binutils-ubuntu22_04-armhf", - "binutils-ubuntu20_04-arm64", - "binutils-ubuntu22_04-arm64"]) + "binutils-opensuseleap-x86_64"]) c['schedulers'].append(binutils_scheduler) binutils_try_scheduler = schedulers.AnyBranchScheduler( @@ -901,10 +850,6 @@ gdb_scheduler = schedulers.SingleBranchScheduler( "gdb-debian-armhf", "gdb-fedora-arm64", "gdb-gentoo-sparc", - "gdb-arm64-ubuntu20_04", - "gdb-arm64-ubuntu22_04", - "gdb-armhf-ubuntu20_04", - "gdb-armhf-ubuntu22_04", "gdb-debian-i386", "gdb-ibm-power9", "gdb-ibm-power10", @@ -953,8 +898,6 @@ gcc_scheduler = schedulers.SingleBranchScheduler( reason="gcc project master branch update", builderNames=["gcc-fedrawhide-x86_64", "gcc-full-debian-amd64", - "gcc-full-ubuntu-armhf", - "gcc-full-ubuntu-arm64", "gcc-full-gentoo-sparc"]) c['schedulers'].append(gcc_scheduler) @@ -2767,34 +2710,6 @@ binutils_opensuseleap_x86_64_builder = util.BuilderConfig( factory=binutils_factory) c['builders'].append(binutils_opensuseleap_x86_64_builder) -binutils_ubuntu20_04_armhf_builder = util.BuilderConfig( - name="binutils-ubuntu20_04-armhf", - workernames=["armhf-ubuntu20_04"], - tags=["binutils", "armhf", "ubuntu"], - factory=binutils_factory) -c['builders'].append(binutils_ubuntu20_04_armhf_builder) - -binutils_ubuntu22_04_armhf_builder = util.BuilderConfig( - name="binutils-ubuntu22_04-armhf", - workernames=["armhf-ubuntu22_04"], - tags=["binutils", "armhf", "ubuntu"], - factory=binutils_factory) -c['builders'].append(binutils_ubuntu22_04_armhf_builder) - -binutils_ubuntu20_04_arm64_builder = util.BuilderConfig( - name="binutils-ubuntu20_04-arm64", - workernames=["arm64-ubuntu20_04"], - tags=["binutils", "arm64", "ubuntu"], - factory=binutils_factory) -c['builders'].append(binutils_ubuntu20_04_arm64_builder) - -binutils_ubuntu22_04_arm64_builder = util.BuilderConfig( - name="binutils-ubuntu22_04-arm64", - workernames=["arm64-ubuntu22_04"], - tags=["binutils", "arm64", "ubuntu"], - factory=binutils_factory) -c['builders'].append(binutils_ubuntu22_04_arm64_builder) - binutils_rawhide_x86_64_builder = util.BuilderConfig( name="binutils-rawhide-x86_64", properties={'container-file': @@ -3235,34 +3150,6 @@ gdb_ibm_power10_builder = util.BuilderConfig( factory=gdb_factory) c['builders'].append(gdb_ibm_power10_builder) -gdb_arm64_ubuntu20_04_builder = util.BuilderConfig( - name="gdb-arm64-ubuntu20_04", - workernames=["arm64-ubuntu20_04"], - tags=["gdb", "arm64", "ubuntu"], - factory=gdb_factory) -c['builders'].append(gdb_arm64_ubuntu20_04_builder) - -gdb_arm64_ubuntu22_04_builder = util.BuilderConfig( - name="gdb-arm64-ubuntu22_04", - workernames=["arm64-ubuntu22_04"], - tags=["gdb", "arm64", "ubuntu"], - factory=gdb_factory) -c['builders'].append(gdb_arm64_ubuntu22_04_builder) - -gdb_armhf_ubuntu20_04_builder = util.BuilderConfig( - name="gdb-armhf-ubuntu20_04", - workernames=["armhf-ubuntu20_04"], - tags=["gdb", "armhf", "ubuntu"], - factory=gdb_32_factory) -c['builders'].append(gdb_armhf_ubuntu20_04_builder) - -gdb_armhf_ubuntu22_04_builder = util.BuilderConfig( - name="gdb-armhf-ubuntu22_04", - workernames=["armhf-ubuntu22_04"], - tags=["gdb", "armhf", "ubuntu"], - factory=gdb_32_factory) -c['builders'].append(gdb_armhf_ubuntu22_04_builder) - # binutils-gdb build steps, factory and builders # just a native build @@ -3628,22 +3515,6 @@ gcc_full_debian_amd64_builder = util.BuilderConfig( factory=gcc_full_build_factory_gen()) c['builders'].append(gcc_full_debian_amd64_builder) -gcc_full_ubuntu_armhf_builder = util.BuilderConfig( - name="gcc-full-ubuntu-armhf", - collapseRequests=True, - workernames=["ubuntu22_04-armhf"], - tags=["gcc-full", "ubuntu", "armhf"], - factory=gcc_full_build_factory_gen()) -c['builders'].append(gcc_full_ubuntu_armhf_builder) - -gcc_full_ubuntu_arm64_builder = util.BuilderConfig( - name="gcc-full-ubuntu-arm64", - collapseRequests=True, - workernames=["ubuntu22_04-arm64"], - tags=["gcc-full", "ubuntu", "arm64"], - factory=gcc_full_build_factory_gen()) -c['builders'].append(gcc_full_ubuntu_arm64_builder) - gcc_full_gentoo_sparc_builder = util.BuilderConfig( name="gcc-full-gentoo-sparc", collapseRequests=True, diff --git a/htdocs/index.html.post b/htdocs/index.html.post index fa9339a..a578713 100644 --- a/htdocs/index.html.post +++ b/htdocs/index.html.post @@ -11,9 +11,6 @@ debian-arm64 and debian-armhf workers
  • Frank Eigler for the fedrawhide-x86_64 worker
  • IBM for the ibm_power8, ibm_power9 and ibm_power10 workers
    • -
  • The Works on Arm initiative for the arm64-ubuntu20_04, - arm64-ubuntu22_04, armhf-ubuntu20_04, armhf-ubuntu22_04 - ubuntu22_04-arm64 and ubuntu22_04-armhf workers
  • OSUOSL for the x86_64 bbo1 and fedora-arm64 workers
  • OSUOSL for hosting the snapshots server
  • Gentoo Foundation and OSUOSL for the gentoo-sparc worker
    • -- 2.39.3