Skip to content

Commit

Permalink
Add CentOS Stream 9 workers and builders (#302)
Browse files Browse the repository at this point in the history 
* Add CentOS Stream 9 workers and builders

Provided for the x86_64, ppc64le and aarch64 architectures

* Move some of the aarch64 builders to stable

* Make the clang unix build a debug one
  • Loading branch information
@stratakis
stratakis committed Jan 27, 2022
1 parent 15552ea commit 8fbb749
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 13 deletions.
41 changes: 31 additions & 10 deletions master/custom/builders.py
View file
Expand Up @@ -2,6 +2,7 @@
UnixBuild,
RHEL7Build,
RHEL8Build,
RHEL9Build,
FedoraStableBuild,
FedoraRawhideBuild,
UnixAsanBuild,
Expand All @@ -22,6 +23,8 @@
LTOPGONonDebugBuild,
RHEL8NoBuiltinHashesUnixBuild,
RHEL8NoBuiltinHashesUnixBuildExceptBlake2,
RHEL9NoBuiltinHashesUnixBuild,
RHEL9NoBuiltinHashesUnixBuildExceptBlake2,
SlowWindowsBuild,
Windows64Build,
Windows64RefleakBuild,
Expand Down Expand Up @@ -96,6 +99,11 @@ def get_builders(settings):
("AMD64 RHEL8 LTO", "cstratak-RHEL8-x86_64", LTONonDebugUnixBuild, STABLE),
("AMD64 RHEL8 LTO + PGO", "cstratak-RHEL8-x86_64", LTOPGONonDebugBuild, STABLE),
("AMD64 RHEL8 FIPS Only Blake2 Builtin Hash", "cstratak-RHEL8-fips-x86_64", RHEL8NoBuiltinHashesUnixBuildExceptBlake2, STABLE),
("AMD64 C9S", "cstratak-c9s-x86_64", RHEL9Build, STABLE),
("AMD64 C9S Refleaks", "cstratak-c9s-x86_64", UnixRefleakBuild, STABLE),
("AMD64 C9S LTO", "cstratak-c9s-x86_64", LTONonDebugUnixBuild, STABLE),
("AMD64 C9S LTO + PGO", "cstratak-c9s-x86_64", LTOPGONonDebugBuild, STABLE),
("AMD64 C9S FIPS Only Blake2 Builtin Hash", "cstratak-c9s-fips-x86_64", RHEL9NoBuiltinHashesUnixBuildExceptBlake2, STABLE),
("AMD64 Arch Linux Asan", "pablogsal-arch-x86_64", UnixAsanBuild, STABLE),
("AMD64 Arch Linux Usan", "pablogsal-arch-x86_64", ClangUbsanLinuxBuild, STABLE),
("AMD64 Arch Linux Asan Debug", "pablogsal-arch-x86_64", UnixAsanDebugBuild, STABLE),
Expand All @@ -117,9 +125,25 @@ def get_builders(settings):
("PPC64LE RHEL8 Refleaks", "cstratak-RHEL8-ppc64le", UnixRefleakBuild, STABLE),
("PPC64LE RHEL8 LTO", "cstratak-RHEL8-ppc64le", LTONonDebugUnixBuild, STABLE),
("PPC64LE RHEL8 LTO + PGO", "cstratak-RHEL8-ppc64le", LTOPGONonDebugBuild, STABLE),

("PPC64LE C9S", "cstratak-c9s-ppc64le", RHEL9Build, STABLE),
("PPC64LE C9S Refleaks", "cstratak-c9s-ppc64le", UnixRefleakBuild, STABLE),
("PPC64LE C9S LTO", "cstratak-c9s-ppc64le", LTONonDebugUnixBuild, STABLE),
("PPC64LE C9S LTO + PGO", "cstratak-c9s-ppc64le", LTOPGONonDebugBuild, STABLE),
# Linux aarch64
("aarch64 Fedora Stable", "cstratak-fedora-stable-aarch64", FedoraStableBuild, STABLE),
("aarch64 Fedora Stable Refleaks", "cstratak-fedora-stable-aarch64", UnixRefleakBuild, STABLE),
("aarch64 Fedora Stable Clang", "cstratak-fedora-stable-aarch64", ClangUnixBuild, STABLE),
("aarch64 Fedora Stable Clang Installed", "cstratak-fedora-stable-aarch64", ClangUnixInstalledBuild, STABLE),
("aarch64 Fedora Stable LTO", "cstratak-fedora-stable-aarch64", LTONonDebugUnixBuild, STABLE),
("aarch64 Fedora Stable LTO + PGO", "cstratak-fedora-stable-aarch64", LTOPGONonDebugBuild, STABLE),

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


# macOS
("x86-64 macOS", "billenstein-macos", UnixBuild, STABLE),
("ARM64 macOS", "pablogsal-macos-m1", MacOSArmWithBrewBuild, STABLE),
Expand Down Expand Up @@ -147,6 +171,7 @@ def get_builders(settings):
("AMD64 Ubuntu", "skumaran-ubuntu-x86_64", UnixBuild, UNSTABLE),
("AMD64 Arch Linux VintageParser", "pablogsal-arch-x86_64", UnixVintageParserBuild, UNSTABLE),
("AMD64 RHEL8 FIPS No Builtin Hashes", "cstratak-RHEL8-fips-x86_64", RHEL8NoBuiltinHashesUnixBuild, UNSTABLE),
("AMD64 C9S FIPS No Builtin Hashes", "cstratak-c9s-fips-x86_64", RHEL9NoBuiltinHashesUnixBuild, UNSTABLE),
# Linux PPC64le
("PPC64LE Fedora Rawhide", "cstratak-fedora-rawhide-ppc64le", FedoraRawhideBuild, UNSTABLE),
("PPC64LE Fedora Rawhide Refleaks", "cstratak-fedora-rawhide-ppc64le", UnixRefleakBuild, UNSTABLE),
Expand All @@ -164,16 +189,9 @@ def get_builders(settings):
("aarch64 Fedora Rawhide LTO", "cstratak-fedora-rawhide-aarch64", LTONonDebugUnixBuild, UNSTABLE),
("aarch64 Fedora Rawhide LTO + PGO", "cstratak-fedora-rawhide-aarch64", LTOPGONonDebugBuild, UNSTABLE),

("aarch64 Fedora Stable Refleaks", "cstratak-fedora-stable-aarch64", UnixRefleakBuild, UNSTABLE),
("aarch64 Fedora Stable Clang", "cstratak-fedora-stable-aarch64", ClangUnixBuild, UNSTABLE),
("aarch64 Fedora Stable Clang Installed", "cstratak-fedora-stable-aarch64", ClangUnixInstalledBuild, UNSTABLE),
("aarch64 Fedora Stable LTO", "cstratak-fedora-stable-aarch64", LTONonDebugUnixBuild, UNSTABLE),
("aarch64 Fedora Stable LTO + PGO", "cstratak-fedora-stable-aarch64", LTOPGONonDebugBuild, UNSTABLE),


("aarch64 RHEL8 Refleaks", "cstratak-RHEL8-aarch64", UnixRefleakBuild, UNSTABLE),
("aarch64 RHEL8 LTO", "cstratak-RHEL8-aarch64", LTONonDebugUnixBuild, UNSTABLE),
("aarch64 RHEL8 LTO + PGO", "cstratak-RHEL8-aarch64", LTOPGONonDebugBuild, UNSTABLE),
("aarch64 C9S Refleaks", "cstratak-c9s-aarch64", UnixRefleakBuild, UNSTABLE),
("aarch64 C9S LTO", "cstratak-c9s-aarch64", LTONonDebugUnixBuild, UNSTABLE),
("aarch64 C9S LTO + PGO", "cstratak-c9s-aarch64", LTOPGONonDebugBuild, UNSTABLE),

# Linux other archs
("s390x Fedora Rawhide", "edelsohn-fedora-rawhide-z", UnixBuild, UNSTABLE),
Expand Down Expand Up @@ -203,11 +221,13 @@ def get_builders(settings):
"AMD64 Fedora Stable Refleaks",
"AMD64 RHEL7 Refleaks",
"AMD64 RHEL8 Refleaks",
"AMD64 C9S Refleaks",
# Linux PPC64LE
"PPC64LE Fedora Rawhide Refleaks",
"PPC64LE Fedora Stable Refleaks",
"PPC64LE RHEL7 Refleaks",
"PPC64LE RHEL8 Refleaks",
"PPC64LE C9S Refleaks",
# Linux s390x
"s390x Fedora Rawhide Refleaks",
"s390x Fedora Refleaks",
Expand All @@ -217,6 +237,7 @@ def get_builders(settings):
"aarch64 Fedora Rawhide Refleaks",
"aarch64 Fedora Stable Refleaks",
"aarch64 RHEL8 Refleaks",
"aarch64 C9S Refleaks",
]

# Match builder name (excluding the branch name) of builders that should only
Expand Down
24 changes: 24 additions & 0 deletions master/custom/factories.py
View file
Expand Up @@ -292,6 +292,7 @@ class ClangUnixBuild(UnixBuild):
configureFlags = [
"CC=clang",
"LD=clang",
"--with-pydebug",
]
factory_tags = ["clang"]

Expand Down Expand Up @@ -384,6 +385,11 @@ class RHEL8Build(RHEL7Build):
"--with-lto",
]

class RHEL9Build(RHEL8Build):
# Build on 64-bit CentOS Stream 9.
# For now, it's the same as RHEL8, but later it may get different
# options.
pass

class FedoraStableBuild(RHEL8Build):
# Build Python on 64-bit Fedora Stable.
Expand Down Expand Up @@ -426,6 +432,24 @@ class RHEL8NoBuiltinHashesUnixBuild(RHEL8Build):
factory_tags = ["no-builtin-hashes"]


class RHEL9NoBuiltinHashesUnixBuildExceptBlake2(RHEL9Build):
# Build on 64-bit CentOS Stream 9 using: --with-builtin-hashlib-hashes=blake2
buildersuffix = ".no-builtin-hashes-except-blake2"
configureFlags = RHEL9Build.configureFlags + [
"--with-builtin-hashlib-hashes=blake2"
]
factory_tags = ["no-builtin-hashes-except-blake2"]


class RHEL9NoBuiltinHashesUnixBuild(RHEL9Build):
# Build on 64-bit CentOS Stream 9 using: --without-builtin-hashlib-hashes
buildersuffix = ".no-builtin-hashes"
configureFlags = RHEL9Build.configureFlags + [
"--without-builtin-hashlib-hashes"
]
factory_tags = ["no-builtin-hashes"]


##############################################################################
############################ MACOS BUILDS ##################################
##############################################################################
Expand Down
26 changes: 23 additions & 3 deletions master/custom/workers.py
View file
Expand Up @@ -99,6 +99,21 @@ def get_workers(settings):
tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64'],
parallel_tests=10,
),
cpw(
name="cstratak-RHEL8-fips-x86_64",
tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64'],
parallel_tests=6,
),
cpw(
name="cstratak-c9s-x86_64",
tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64'],
parallel_tests=6,
),
cpw(
name="cstratak-c9s-fips-x86_64",
tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64'],
parallel_tests=6,
),
cpw(
name="cstratak-fedora-rawhide-ppc64le",
tags=['linux', 'unix', 'fedora', 'ppc64le'],
Expand All @@ -119,6 +134,11 @@ def get_workers(settings):
tags=['linux', 'unix', 'rhel', 'ppc64le'],
parallel_tests=10,
),
cpw(
name="cstratak-c9s-ppc64le",
tags=['linux', 'unix', 'rhel', 'ppc64le'],
parallel_tests=10,
),
cpw(
name="cstratak-fedora-rawhide-aarch64",
tags=['linux', 'unix', 'fedora', 'arm', 'arm64', 'aarch64'],
Expand All @@ -135,9 +155,9 @@ def get_workers(settings):
parallel_tests=40,
),
cpw(
name="cstratak-RHEL8-fips-x86_64",
tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64'],
parallel_tests=6,
name="cstratak-c9s-aarch64",
tags=['linux', 'unix', 'rhel', 'arm', 'arm64', 'aarch64'],
parallel_tests=40,
),
cpw(
name="edelsohn-aix-ppc64",
Expand Down

0 comments on commit 8fbb749

Please sign in to comment.