From 5b16ab1d7a8e0fbc3ec2218a6087ad292dba41dd Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 11 Aug 2022 22:36:42 +0200 Subject: [PATCH] Add ubuntu22_04-arm64 and ubuntu22_04-armhf workers for gcc Two more workers from the Works on Arm initiative to do full gcc builds (bootstrap plus make check). --- buildbot.config.sample | 2 ++ builder/master.cfg | 39 ++++++++++++++++++++++++++++++++++++++- htdocs/index.html.post | 4 ++-- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/buildbot.config.sample b/buildbot.config.sample index b4c3f11..7986c6a 100644 --- a/buildbot.config.sample +++ b/buildbot.config.sample @@ -20,6 +20,8 @@ arm64-ubuntu20_04=frob arm64-ubuntu22_04=frob armhf-ubuntu20_04=frob armhf-ubuntu22_04=frob +ubuntu22_04-arm64=frob +ubuntu22_04-armhf=frob fedora-arm64=frob # Users diff --git a/builder/master.cfg b/builder/master.cfg index 55f8d3b..f945b14 100644 --- a/builder/master.cfg +++ b/builder/master.cfg @@ -241,6 +241,8 @@ ibm_power10_worker = worker.Worker("ibm_power10", '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, @@ -269,6 +271,23 @@ armhf_ubuntu22_04_worker = worker.Worker("armhf-ubuntu22_04", 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"), @@ -788,7 +807,9 @@ gcc_scheduler = schedulers.SingleBranchScheduler( branch="master"), reason="gcc project master branch update", builderNames=["gcc-fedrawhide-x86_64", - "gcc-full-debian-amd64"]) + "gcc-full-debian-amd64", + "gcc-full-ubuntu-armhf", + "gcc-full-ubuntu-arm64"]) c['schedulers'].append(gcc_scheduler) systemtap_scheduler = schedulers.SingleBranchScheduler( @@ -3002,6 +3023,22 @@ gcc_full_debian_amd64_builder = util.BuilderConfig( factory=gcc_full_build_factory) 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) +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) +c['builders'].append(gcc_full_ubuntu_arm64_builder) + # glibc build steps, factory, builders diff --git a/htdocs/index.html.post b/htdocs/index.html.post index 56cf675..c9767c6 100644 --- a/htdocs/index.html.post +++ b/htdocs/index.html.post @@ -12,8 +12,8 @@
  • 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 and - armhf-ubuntu22_04 workers
    • + arm64-ubuntu22_04, armhf-ubuntu20_04, armhf-ubuntu22_04 + ubuntu22_04-arm64 and ubuntu22_04-armhf workers
  • OSUOSL for the fedora-arm64 worker

    • -- 2.31.1