diff --git a/master/custom/builders.py b/master/custom/builders.py index 20b9a400..a2012f0b 100644 --- a/master/custom/builders.py +++ b/master/custom/builders.py @@ -41,6 +41,8 @@ RHEL8NoBuiltinHashesUnixBuildExceptBlake2, CentOS9NoBuiltinHashesUnixBuild, CentOS9NoBuiltinHashesUnixBuildExceptBlake2, + CentOS10NoBuiltinHashesUnixBuild, + CentOS10NoBuiltinHashesUnixBuildExceptBlake2, Windows64Build, Windows64NoGilBuild, Windows64PGOTailcallBuild, @@ -400,6 +402,12 @@ def generate_builderdefs(tags, entries): ("AMD64 Fedora Rawhide LTO", "cstratak-fedora-rawhide-x86_64", LTONonDebugUnixBuild), ("AMD64 Fedora Rawhide LTO + PGO", "cstratak-fedora-rawhide-x86_64", LTOPGONonDebugBuild), + # CentOS Stream 10 Linux x86-64 GCC + ("AMD64 CentOS10", "cstratak-CentOS10-x86_64", CentOS10Build), + ("AMD64 CentOS10 Refleaks", "cstratak-CentOS10-x86_64", UnixRefleakBuild), + ("AMD64 CentOS10 LTO", "cstratak-CentOS10-x86_64", LTONonDebugUnixBuild), + ("AMD64 CentOS10 LTO + PGO", "cstratak-CentOS10-x86_64", LTOPGONonDebugBuild), + ("AMD64 Ubuntu", "skumaran-ubuntu-x86_64", UnixBuild), ("AMD64 RHEL8 FIPS No Builtin Hashes", "cstratak-RHEL8-fips-x86_64", RHEL8NoBuiltinHashesUnixBuild), @@ -407,6 +415,9 @@ def generate_builderdefs(tags, entries): ("AMD64 CentOS9 FIPS Only Blake2 Builtin Hash", "cstratak-CentOS9-fips-x86_64", CentOS9NoBuiltinHashesUnixBuildExceptBlake2), ("AMD64 CentOS9 FIPS No Builtin Hashes", "cstratak-CentOS9-fips-x86_64", CentOS9NoBuiltinHashesUnixBuild), + ("AMD64 CentOS10 FIPS Only Blake2 Builtin Hash", "cstratak-CentOS10-fips-x86_64", CentOS10NoBuiltinHashesUnixBuildExceptBlake2), + ("AMD64 CentOS10 FIPS No Builtin Hashes", "cstratak-CentOS10-fips-x86_64", CentOS10NoBuiltinHashesUnixBuild), + BuilderDef( "AMD64 Arch Linux Valgrind", ValgrindBuild, @@ -425,6 +436,10 @@ 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), + # CentOS Stream 10 Linux x86-64 Clang + ("AMD64 CentOS10 Clang", "cstratak-CentOS10-x86_64", ClangUnixBuild), + ("AMD64 CentOS10 Clang Installed", "cstratak-CentOS10-x86_64", ClangUnixInstalledBuild), + # Fedora Linux ppc64le GCC # Fedora Rawhide is unstable ("PPC64LE Fedora Rawhide", "cstratak-fedora-rawhide-ppc64le", FedoraRawhideBuild), diff --git a/master/custom/factories.py b/master/custom/factories.py index 8e56cbeb..9fa1b28d 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -557,6 +557,24 @@ class CentOS9NoBuiltinHashesUnixBuild(CentOS9Build): factory_tags = ["no-builtin-hashes"] +class CentOS10NoBuiltinHashesUnixBuildExceptBlake2(CentOS10Build): + # Build on 64-bit CentOS Stream 10 using: --with-builtin-hashlib-hashes=blake2 + buildersuffix = ".no-builtin-hashes-except-blake2" + configureFlags = CentOS10Build.configureFlags + [ + "--with-builtin-hashlib-hashes=blake2" + ] + factory_tags = ["no-builtin-hashes-except-blake2"] + + +class CentOS10NoBuiltinHashesUnixBuild(CentOS10Build): + # Build on 64-bit CentOS Stream 10 using: --without-builtin-hashlib-hashes + buildersuffix = ".no-builtin-hashes" + configureFlags = CentOS10Build.configureFlags + [ + "--without-builtin-hashlib-hashes" + ] + factory_tags = ["no-builtin-hashes"] + + ############################################################################## ############################ MACOS BUILDS ################################## ############################################################################## diff --git a/master/custom/workers.py b/master/custom/workers.py index a68b5244..fe089024 100644 --- a/master/custom/workers.py +++ b/master/custom/workers.py @@ -144,6 +144,18 @@ def get_workers(settings): # Only 3.12+ for FIPS builder branches=BRANCHES.only_since(3, 12), ), + cpw( + name="cstratak-CentOS10-x86_64", + tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64', 'dtrace'], + parallel_tests=6, + ), + cpw( + name="cstratak-CentOS10-fips-x86_64", + tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64', 'fips', 'dtrace'], + parallel_tests=6, + # Only 3.12+ for FIPS builder + branches=BRANCHES.only_since(3, 12), + ), cpw( name="cstratak-fedora-rawhide-ppc64le", tags=['linux', 'unix', 'fedora', 'ppc64le', 'dtrace'],