Skip to content

Update builder tiers to match PEP 11 #792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
StanFromIreland wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update builder tiers to match PEP 11 #792

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e78921c
Update builder tiers to match PEP 11
StanFromIreland Sep 14, 2026
b0e8ed9
Merge branch 'main' into pep-11-update
StanFromIreland Sep 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 77 additions & 69 deletions master/custom/builders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,32 @@ def generate_builderdefs(tags, entries):
("AMD64 CentOS9 NoGIL", "itamaro-centos-aws", UnixNoGilBuild),
("AMD64 CentOS9 NoGIL Refleaks", "itamaro-centos-aws", UnixNoGilRefleakBuild),

# Fedora Linux aarch64 GCC
("aarch64 Fedora Stable", "cstratak-fedora-stable-aarch64", FedoraStableBuild),
("aarch64 Fedora Stable Refleaks", "cstratak-fedora-stable-aarch64", UnixRefleakBuild),
("aarch64 Fedora Stable LTO", "cstratak-fedora-stable-aarch64", LTONonDebugUnixBuild),
("aarch64 Fedora Stable LTO + PGO", "cstratak-fedora-stable-aarch64", LTOPGONonDebugBuild),

# RHEL8 aarch64 GCC
("aarch64 RHEL8", "cstratak-RHEL8-aarch64", RHEL8Build),
("aarch64 RHEL8 Refleaks", "cstratak-RHEL8-aarch64", UnixRefleakBuild),
("aarch64 RHEL8 LTO", "cstratak-RHEL8-aarch64", LTONonDebugUnixBuild),
("aarch64 RHEL8 LTO + PGO", "cstratak-RHEL8-aarch64", LTOPGONonDebugBuild),

# CentOS Stream 9 Linux aarch64 GCC
("aarch64 CentOS9", "cstratak-CentOS9-aarch64", CentOS9Build),
("aarch64 CentOS9 Refleaks", "cstratak-CentOS9-aarch64", UnixRefleakBuild),
("aarch64 CentOS9 LTO", "cstratak-CentOS9-aarch64", LTONonDebugUnixBuild),
("aarch64 CentOS9 LTO + PGO", "cstratak-CentOS9-aarch64", LTOPGONonDebugBuild),

# Ubuntu Linux AArch64
("aarch64 Ubuntu 24.04 BigMem", "diegorusso-aarch64-bigmem", UnixBigmemBuild),

# macOS aarch64 clang
("ARM64 macOS", "pablogsal-macos-m1", MacOSArmWithBrewBuild),
("ARM64 MacOS M1 NoGIL", "itamaro-macos-arm64-aws", MacOSArmWithBrewNoGilBuild),
("ARM64 MacOS M1 Refleaks NoGIL", "itamaro-macos-arm64-aws", MacOSArmWithBrewNoGilRefleakBuild),

# Windows x86-64 MSVC
("AMD64 Windows10", "bolen-windows10", Windows64Build),
("AMD64 Windows11 Non-Debug", "ware-win11", Windows64ReleaseBuild),
Expand Down Expand Up @@ -239,56 +262,16 @@ def generate_builderdefs(tags, entries):
("AMD64 Fedora Stable Clang", "cstratak-fedora-stable-x86_64", ClangUnixBuild),
("AMD64 Fedora Stable Clang Installed", "cstratak-fedora-stable-x86_64", ClangUnixInstalledBuild),

# Fedora Linux ppc64le GCC
("PPC64LE Fedora Stable", "cstratak-fedora-stable-ppc64le", FedoraStableBuild),
("PPC64LE Fedora Stable Refleaks", "cstratak-fedora-stable-ppc64le", UnixRefleakBuild),
("PPC64LE Fedora Stable LTO", "cstratak-fedora-stable-ppc64le", LTONonDebugUnixBuild),
("PPC64LE Fedora Stable LTO + PGO", "cstratak-fedora-stable-ppc64le", LTOPGONonDebugBuild),

# RHEL8 ppc64le GCC
("PPC64LE RHEL8", "cstratak-RHEL8-ppc64le", RHEL8Build),
("PPC64LE RHEL8 Refleaks", "cstratak-RHEL8-ppc64le", UnixRefleakBuild),
("PPC64LE RHEL8 LTO", "cstratak-RHEL8-ppc64le", LTONonDebugUnixBuild),
("PPC64LE RHEL8 LTO + PGO", "cstratak-RHEL8-ppc64le", LTOPGONonDebugBuild),

# CentOS Stream 9 Linux ppc64le GCC
("PPC64LE CentOS9", "cstratak-CentOS9-ppc64le", CentOS9Build),
("PPC64LE CentOS9 Refleaks", "cstratak-CentOS9-ppc64le", UnixRefleakBuild),
("PPC64LE CentOS9 LTO", "cstratak-CentOS9-ppc64le", LTONonDebugUnixBuild),
("PPC64LE CentOS9 LTO + PGO", "cstratak-CentOS9-ppc64le", LTOPGONonDebugBuild),

# Fedora Linux aarch64 GCC/Clang
("aarch64 Fedora Stable", "cstratak-fedora-stable-aarch64", FedoraStableBuild),
("aarch64 Fedora Stable Refleaks", "cstratak-fedora-stable-aarch64", UnixRefleakBuild),
# Fedora Linux aarch64 Clang
("aarch64 Fedora Stable Clang", "cstratak-fedora-stable-aarch64", ClangUnixBuild),
("aarch64 Fedora Stable Clang Installed", "cstratak-fedora-stable-aarch64", ClangUnixInstalledBuild),
("aarch64 Fedora Stable LTO", "cstratak-fedora-stable-aarch64", LTONonDebugUnixBuild),
("aarch64 Fedora Stable LTO + PGO", "cstratak-fedora-stable-aarch64", LTOPGONonDebugBuild),

# RHEL8 aarch64 GCC
("aarch64 RHEL8", "cstratak-RHEL8-aarch64", RHEL8Build),
("aarch64 RHEL8 Refleaks", "cstratak-RHEL8-aarch64", UnixRefleakBuild),
("aarch64 RHEL8 LTO", "cstratak-RHEL8-aarch64", LTONonDebugUnixBuild),
("aarch64 RHEL8 LTO + PGO", "cstratak-RHEL8-aarch64", LTOPGONonDebugBuild),

# CentOS Stream 9 Linux aarch64 GCC
("aarch64 CentOS9", "cstratak-CentOS9-aarch64", CentOS9Build),
("aarch64 CentOS9 Refleaks", "cstratak-CentOS9-aarch64", UnixRefleakBuild),
("aarch64 CentOS9 LTO", "cstratak-CentOS9-aarch64", LTONonDebugUnixBuild),
("aarch64 CentOS9 LTO + PGO", "cstratak-CentOS9-aarch64", LTOPGONonDebugBuild),

# macOS aarch64 clang
("ARM64 macOS", "pablogsal-macos-m1", MacOSArmWithBrewBuild),
("ARM64 MacOS M1 NoGIL", "itamaro-macos-arm64-aws", MacOSArmWithBrewNoGilBuild),
("ARM64 MacOS M1 Refleaks NoGIL", "itamaro-macos-arm64-aws", MacOSArmWithBrewNoGilRefleakBuild),

# macOS x86-64 clang
("x86-64 macOS", "billenstein-macos", UnixBuild),
("x86-64 MacOS Intel NoGIL", "itamaro-macos-intel-aws", UnixNoGilBuild),
("x86-64 MacOS Intel ASAN NoGIL", "itamaro-macos-intel-aws", MacOSAsanNoGilBuild),

# WASI
("wasm32-wasi Non-Debug", "bcannon-wasi", Wasm32WasiCrossBuild),
("wasm32-wasi", "bcannon-wasi", Wasm32WasiPreview1DebugBuild),

# Windows aarch64 MSVC
Expand All @@ -301,11 +284,9 @@ def generate_builderdefs(tags, entries):
# -- Stable Tier-3 builder ----------------------------------------------
BUILDER_DEFS.extend(generate_builderdefs({STABLE, TIER_3}, [

# Fedora Linux s390x GCC/Clang
# Fedora Linux s390x GCC
("s390x Fedora Stable", "cstratak-fedora-stable-s390x", UnixBuild),
("s390x Fedora Stable Refleaks", "cstratak-fedora-stable-s390x", UnixRefleakBuild),
("s390x Fedora Stable Clang", "cstratak-fedora-stable-s390x", ClangUnixBuild),
("s390x Fedora Stable Clang Installed", "cstratak-fedora-stable-s390x", ClangUnixInstalledBuild),
("s390x Fedora Stable LTO", "cstratak-fedora-stable-s390x", LTONonDebugUnixBuild),
("s390x Fedora Stable LTO + PGO", "cstratak-fedora-stable-s390x", LTOPGONonDebugBuild),

Expand All @@ -321,9 +302,25 @@ def generate_builderdefs(tags, entries):
("s390x RHEL8 LTO", "cstratak-rhel8-s390x", LTONonDebugUnixBuild),
("s390x RHEL8 LTO + PGO", "cstratak-rhel8-s390x", LTOPGONonDebugBuild),

# Fedora Linux ppc64le Clang
# Fedora Linux ppc64le GCC/Clang
("PPC64LE Fedora Stable", "cstratak-fedora-stable-ppc64le", FedoraStableBuild),
("PPC64LE Fedora Stable Refleaks", "cstratak-fedora-stable-ppc64le", UnixRefleakBuild),
("PPC64LE Fedora Stable Clang", "cstratak-fedora-stable-ppc64le", ClangUnixBuild),
("PPC64LE Fedora Stable Clang Installed", "cstratak-fedora-stable-ppc64le", ClangUnixInstalledBuild),
("PPC64LE Fedora Stable LTO", "cstratak-fedora-stable-ppc64le", LTONonDebugUnixBuild),
("PPC64LE Fedora Stable LTO + PGO", "cstratak-fedora-stable-ppc64le", LTOPGONonDebugBuild),

# RHEL8 ppc64le GCC
("PPC64LE RHEL8", "cstratak-RHEL8-ppc64le", RHEL8Build),
("PPC64LE RHEL8 Refleaks", "cstratak-RHEL8-ppc64le", UnixRefleakBuild),
("PPC64LE RHEL8 LTO", "cstratak-RHEL8-ppc64le", LTONonDebugUnixBuild),
("PPC64LE RHEL8 LTO + PGO", "cstratak-RHEL8-ppc64le", LTOPGONonDebugBuild),

# CentOS Stream 9 Linux ppc64le GCC
("PPC64LE CentOS9", "cstratak-CentOS9-ppc64le", CentOS9Build),
("PPC64LE CentOS9 Refleaks", "cstratak-CentOS9-ppc64le", UnixRefleakBuild),
("PPC64LE CentOS9 LTO", "cstratak-CentOS9-ppc64le", LTONonDebugUnixBuild),
("PPC64LE CentOS9 LTO + PGO", "cstratak-CentOS9-ppc64le", LTOPGONonDebugBuild),

# Linux armv7l (32-bit) GCC
("ARM Raspbian", "gps-raspbian", SlowNonDebugUnixBuild15BitDigits),
Expand All @@ -346,6 +343,9 @@ def generate_builderdefs(tags, entries):
# Emscripten
("WASM Emscripten", "rkm-emscripten", EmscriptenBuild),

# WASI (3.11 and 3.12 only, where WASI was tier 3)
("wasm32-wasi Non-Debug", "bcannon-wasi", Wasm32WasiCrossBuild),
Comment on lines +346 to +347

@StanFromIreland StanFromIreland Sep 14, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consistent with:

buildmaster-config/master/custom/factories.py

Lines 984 to 987 in e78921c

# The non-debug WASI buildbot is meant for 3.11 and 3.12 only.
# Don't use it on PRs; it's tier 3 only and getting it to
# work on PRs against `main` is too much work.
self.branches = {BRANCHES[3, 11], BRANCHES[3, 12]}


# RISC-V 64-bit GCC/Clang
("riscv64 Ubuntu", "onder-riscv64", SlowUnixInstalledBuild),
("RISC-V 64-bit Ubuntu", "rise-riscv64-4", SlowDebugUnixBuild),
Expand Down Expand Up @@ -381,6 +381,10 @@ def generate_builderdefs(tags, entries):
# Linux x86 (32-bit) GCC
("x86 Debian Non-Debug with X", "ware-debian-x86", NonDebugUnixBuild),
("x86 Debian Installed with X", "ware-debian-x86", UnixInstalledBuild),

# Linux s390x Clang (PEP 11 only covers s390x with GCC)
("s390x Fedora Stable Clang", "cstratak-fedora-stable-s390x", ClangUnixBuild),
("s390x Fedora Stable Clang Installed", "cstratak-fedora-stable-s390x", ClangUnixInstalledBuild),
]))


Expand All @@ -395,6 +399,19 @@ def generate_builderdefs(tags, entries):

("AMD64 Ubuntu", "skumaran-ubuntu-x86_64", UnixBuild),

# Fedora Linux aarch64 GCC
# Fedora Rawhide is unstable
("aarch64 Fedora Rawhide", "cstratak-fedora-rawhide-aarch64", FedoraRawhideBuild),
("aarch64 Fedora Rawhide Refleaks", "cstratak-fedora-rawhide-aarch64", UnixRefleakBuild),
("aarch64 Fedora Rawhide LTO", "cstratak-fedora-rawhide-aarch64", LTONonDebugUnixBuild),
("aarch64 Fedora Rawhide LTO + PGO", "cstratak-fedora-rawhide-aarch64", LTOPGONonDebugBuild),

# CentOS Stream 10 Linux aarch64 GCC
("aarch64 CentOS10", "cstratak-CentOS10-aarch64", CentOS10Build),
("aarch64 CentOS10 Refleaks", "cstratak-CentOS10-aarch64", UnixRefleakBuild),
("aarch64 CentOS10 LTO", "cstratak-CentOS10-aarch64", LTONonDebugUnixBuild),
("aarch64 CentOS10 LTO + PGO", "cstratak-CentOS10-aarch64", LTOPGONonDebugBuild),

("AMD64 RHEL8 FIPS No Builtin Hashes", "cstratak-RHEL8-fips-x86_64", RHEL8NoBuiltinHashesUnixBuild),

("AMD64 CentOS9 FIPS Only Blake2 Builtin Hash", "cstratak-CentOS9-fips-x86_64", CentOS9NoBuiltinHashesUnixBuildExceptBlake2),
Expand All @@ -418,29 +435,14 @@ def generate_builderdefs(tags, entries):
("AMD64 Fedora Rawhide Clang", "cstratak-fedora-rawhide-x86_64", ClangUnixBuild),
("AMD64 Fedora Rawhide Clang Installed", "cstratak-fedora-rawhide-x86_64", ClangUnixInstalledBuild),

# Fedora Linux ppc64le GCC
# Fedora Linux aarch64 Clang
# Fedora Rawhide is unstable
("PPC64LE Fedora Rawhide", "cstratak-fedora-rawhide-ppc64le", FedoraRawhideBuild),
("PPC64LE Fedora Rawhide Refleaks", "cstratak-fedora-rawhide-ppc64le", UnixRefleakBuild),
("PPC64LE Fedora Rawhide LTO", "cstratak-fedora-rawhide-ppc64le", LTONonDebugUnixBuild),
("PPC64LE Fedora Rawhide LTO + PGO", "cstratak-fedora-rawhide-ppc64le", LTOPGONonDebugBuild),

# Fedora Linux aarch64 GCC/Clang
# Fedora Rawhide is unstable
("aarch64 Fedora Rawhide", "cstratak-fedora-rawhide-aarch64", FedoraRawhideBuild),
("aarch64 Fedora Rawhide Refleaks", "cstratak-fedora-rawhide-aarch64", UnixRefleakBuild),
("aarch64 Fedora Rawhide Clang", "cstratak-fedora-rawhide-aarch64", ClangUnixBuild),
("aarch64 Fedora Rawhide Clang Installed", "cstratak-fedora-rawhide-aarch64", ClangUnixInstalledBuild),
("aarch64 Fedora Rawhide LTO", "cstratak-fedora-rawhide-aarch64", LTONonDebugUnixBuild),
("aarch64 Fedora Rawhide LTO + PGO", "cstratak-fedora-rawhide-aarch64", LTOPGONonDebugBuild),

# CentOS Stream 10 Linux aarch64 GCC/Clang
("aarch64 CentOS10", "cstratak-CentOS10-aarch64", CentOS10Build),
("aarch64 CentOS10 Refleaks", "cstratak-CentOS10-aarch64", UnixRefleakBuild),
# CentOS Stream 10 Linux aarch64 Clang
("aarch64 CentOS10 Clang", "cstratak-CentOS10-aarch64", ClangUnixBuild),
("aarch64 CentOS10 Clang Installed", "cstratak-CentOS10-aarch64", ClangUnixInstalledBuild),
("aarch64 CentOS10 LTO", "cstratak-CentOS10-aarch64", LTONonDebugUnixBuild),
("aarch64 CentOS10 LTO + PGO", "cstratak-CentOS10-aarch64", LTOPGONonDebugBuild),

# WebAssembly
("wasm32 WASI 8Core", "kushaldas-wasi", Wasm32WasiCrossBuild),
Expand All @@ -449,24 +451,24 @@ def generate_builderdefs(tags, entries):

# -- Unstable Tier-3 builders -------------------------------------------
BUILDER_DEFS.extend(generate_builderdefs({UNSTABLE, TIER_3}, [
# Linux ppc64le Clang
# Linux ppc64le GCC/Clang
# Fedora Rawhide is unstable
("PPC64LE Fedora Rawhide", "cstratak-fedora-rawhide-ppc64le", FedoraRawhideBuild),
("PPC64LE Fedora Rawhide Refleaks", "cstratak-fedora-rawhide-ppc64le", UnixRefleakBuild),
("PPC64LE Fedora Rawhide Clang", "cstratak-fedora-rawhide-ppc64le", ClangUnixBuild),
("PPC64LE Fedora Rawhide Clang Installed", "cstratak-fedora-rawhide-ppc64le", ClangUnixInstalledBuild),
("PPC64LE Fedora Rawhide LTO", "cstratak-fedora-rawhide-ppc64le", LTONonDebugUnixBuild),
("PPC64LE Fedora Rawhide LTO + PGO", "cstratak-fedora-rawhide-ppc64le", LTOPGONonDebugBuild),

# Linux s390x GCC/Clang
# Linux s390x GCC
("s390x Fedora Rawhide", "cstratak-fedora-rawhide-s390x", UnixBuild),
("s390x Fedora Rawhide Refleaks", "cstratak-fedora-rawhide-s390x", UnixRefleakBuild),
("s390x Fedora Rawhide Clang", "cstratak-fedora-rawhide-s390x", ClangUnixBuild),
("s390x Fedora Rawhide Clang Installed", "cstratak-fedora-rawhide-s390x", ClangUnixInstalledBuild),
("s390x Fedora Rawhide LTO", "cstratak-fedora-rawhide-s390x", LTONonDebugUnixBuild),
("s390x Fedora Rawhide LTO + PGO", "cstratak-fedora-rawhide-s390x", LTOPGONonDebugBuild),

# CentOS Stream 10 Linux s390x GCC/Clang
# CentOS Stream 10 Linux s390x GCC
("s390x CentOS10", "cstratak-c10s-s390x", CentOS10Build),
("s390x CentOS10 Refleaks", "cstratak-c10s-s390x", UnixRefleakBuild),
("s390x CentOS10 Clang", "cstratak-c10s-s390x", ClangUnixBuild),
("s390x CentOS10 Clang Installed", "cstratak-c10s-s390x", ClangUnixInstalledBuild),
("s390x CentOS10 LTO", "cstratak-c10s-s390x", LTONonDebugUnixBuild),
("s390x CentOS10 LTO + PGO", "cstratak-c10s-s390x", LTOPGONonDebugBuild),

Expand All @@ -492,6 +494,12 @@ def generate_builderdefs(tags, entries):
("PPC64LE Fedora Rawhide NoGIL refleaks", "cstratak-fedora-rawhide-ppc64le", UnixNoGilRefleakBuild),
("s390x Fedora Rawhide NoGIL refleaks", "cstratak-fedora-rawhide-s390x", UnixNoGilRefleakBuild),

# Linux s390x Clang (PEP 11 only covers s390x with GCC)
("s390x Fedora Rawhide Clang", "cstratak-fedora-rawhide-s390x", ClangUnixBuild),
("s390x Fedora Rawhide Clang Installed", "cstratak-fedora-rawhide-s390x", ClangUnixInstalledBuild),
("s390x CentOS10 Clang", "cstratak-c10s-s390x", ClangUnixBuild),
("s390x CentOS10 Clang Installed", "cstratak-c10s-s390x", ClangUnixInstalledBuild),

# Linux x86-64 NixOS Unstable
("AMD64 NixOS Unstable", "malvex-nixos-x86_64", UnixBuild),
("AMD64 NixOS Unstable Refleaks", "malvex-nixos-x86_64", UnixRefleakBuild),
Expand Down