Skip to content
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

Add FedoraBuild for Fedora and RHEL #264

Merged
merged 4 commits into from
Sep 9, 2021
Merged

Add FedoraBuild for Fedora and RHEL #264

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd065bd
Add FedoraBuild for Fedora and RHEL
vstinner Sep 9, 2021
1009f64
Create build per version
vstinner Sep 9, 2021
5b7035e
Disable system flags
vstinner Sep 9, 2021
23879c1
Specify 64-bit
vstinner Sep 9, 2021
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
29 changes: 15 additions & 14 deletions master/custom/builders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from custom.factories import (
UnixBuild,
FedoraBuild,
UnixAsanBuild,
UnixAsanDebugBuild,
UnixTraceRefsBuild,
Expand Down Expand Up @@ -59,10 +60,10 @@ def get_builders(settings):
("AMD64 Debian root", "angelico-debian-amd64", UnixBuild, STABLE),
("AMD64 Debian PGO", "gps-debian-profile-opt", PGOUnixBuild, STABLE),
("AMD64 Ubuntu Shared", "bolen-ubuntu", SharedUnixBuild, STABLE),
("PPC64 Fedora", "edelsohn-fedora-ppc64", UnixBuild, STABLE),
("PPC64 Fedora", "edelsohn-fedora-ppc64", FedoraBuild, STABLE),
("s390x SLES", "edelsohn-sles-z", UnixBuild, STABLE),
("s390x Debian", "edelsohn-debian-z", UnixBuild, STABLE),
("s390x Fedora", "edelsohn-fedora-z", UnixBuild, STABLE),
("s390x Fedora", "edelsohn-fedora-z", FedoraBuild, STABLE),
("s390x Fedora Refleaks", "edelsohn-fedora-z", UnixRefleakBuild, STABLE),
("s390x Fedora Clang", "edelsohn-fedora-z", ClangUnixBuild, STABLE),
("s390x Fedora Clang Installed", "edelsohn-fedora-z", ClangUnixInstalledBuild, STABLE),
Expand All @@ -78,41 +79,41 @@ def get_builders(settings):
("s390x RHEL8 LTO + PGO", "edelsohn-rhel8-z", LTOPGONonDebugBuild, STABLE),
("x86 Gentoo Non-Debug with X", "ware-gentoo-x86", SlowNonDebugUnixBuild, STABLE),
("x86 Gentoo Installed with X", "ware-gentoo-x86", SlowUnixInstalledBuild, STABLE),
("AMD64 Fedora Stable", "cstratak-fedora-stable-x86_64", UnixBuild, STABLE),
("AMD64 Fedora Stable", "cstratak-fedora-stable-x86_64", FedoraBuild, STABLE),
("AMD64 Fedora Stable Refleaks", "cstratak-fedora-stable-x86_64", UnixRefleakBuild, STABLE),
("AMD64 Fedora Stable Clang", "cstratak-fedora-stable-x86_64", ClangUnixBuild, STABLE),
("AMD64 Fedora Stable Clang Installed", "cstratak-fedora-stable-x86_64", ClangUnixInstalledBuild, STABLE),
("AMD64 Fedora Stable LTO", "cstratak-fedora-stable-x86_64", LTONonDebugUnixBuild, STABLE),
("AMD64 Fedora Stable LTO + PGO", "cstratak-fedora-stable-x86_64", LTOPGONonDebugBuild, STABLE),
("AMD64 RHEL7", "cstratak-RHEL7-x86_64", UnixBuild, STABLE),
("AMD64 RHEL7", "cstratak-RHEL7-x86_64", FedoraBuild, STABLE),
("AMD64 RHEL7 Refleaks", "cstratak-RHEL7-x86_64", UnixRefleakBuild, STABLE),
("AMD64 RHEL7 LTO", "cstratak-RHEL7-x86_64", LTONonDebugUnixBuild, STABLE),
("AMD64 RHEL7 LTO + PGO", "cstratak-RHEL7-x86_64", LTOPGONonDebugBuild, STABLE),
("AMD64 RHEL8", "cstratak-RHEL8-x86_64", UnixBuild, STABLE),
("AMD64 RHEL8", "cstratak-RHEL8-x86_64", FedoraBuild, STABLE),
("AMD64 RHEL8 Refleaks", "cstratak-RHEL8-x86_64", UnixRefleakBuild, STABLE),
("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", NoBuiltinHashesUnixBuildExceptBlake2, STABLE),
# Linux PPC64le
("PPC64LE Fedora Stable", "cstratak-fedora-stable-ppc64le", UnixBuild, STABLE),
("PPC64LE Fedora Stable", "cstratak-fedora-stable-ppc64le", FedoraBuild, STABLE),
("PPC64LE Fedora Stable Refleaks", "cstratak-fedora-stable-ppc64le", UnixRefleakBuild, STABLE),
("PPC64LE Fedora Stable Clang", "cstratak-fedora-stable-ppc64le", ClangUnixBuild, STABLE),
("PPC64LE Fedora Stable Clang Installed", "cstratak-fedora-stable-ppc64le", ClangUnixInstalledBuild, STABLE),
("PPC64LE Fedora Stable LTO", "cstratak-fedora-stable-ppc64le", LTONonDebugUnixBuild, STABLE),
("PPC64LE Fedora Stable LTO + PGO", "cstratak-fedora-stable-ppc64le", LTOPGONonDebugBuild, STABLE),

("PPC64LE RHEL7", "cstratak-RHEL7-ppc64le", UnixBuild, STABLE),
("PPC64LE RHEL7", "cstratak-RHEL7-ppc64le", FedoraBuild, STABLE),
("PPC64LE RHEL7 Refleaks", "cstratak-RHEL7-ppc64le", UnixRefleakBuild, STABLE),
("PPC64LE RHEL7 LTO", "cstratak-RHEL7-ppc64le", LTONonDebugUnixBuild, STABLE),
("PPC64LE RHEL7 LTO + PGO", "cstratak-RHEL7-ppc64le", LTOPGONonDebugBuild, STABLE),

("PPC64LE RHEL8", "cstratak-RHEL8-ppc64le", UnixBuild, STABLE),
("PPC64LE RHEL8", "cstratak-RHEL8-ppc64le", FedoraBuild, STABLE),
("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),
# Linux aarch64
("aarch64 Fedora Stable", "cstratak-fedora-stable-aarch64", UnixBuild, STABLE),
("aarch64 RHEL8", "cstratak-RHEL8-aarch64", UnixBuild, STABLE),
("aarch64 Fedora Stable", "cstratak-fedora-stable-aarch64", FedoraBuild, STABLE),
("aarch64 RHEL8", "cstratak-RHEL8-aarch64", FedoraBuild, STABLE),
# macOS
("x86-64 macOS", "billenstein-macos", UnixBuild, STABLE),
# Other Unix
Expand All @@ -129,7 +130,7 @@ def get_builders(settings):
# Linux x86 / AMD64
("AMD64 Clang UBSan", "gps-clang-ubsan", ClangUbsanLinuxBuild, UNSTABLE),
("AMD64 Alpine Linux", "ware-alpine", UnixBuild, UNSTABLE),
("AMD64 Fedora Rawhide", "cstratak-fedora-rawhide-x86_64", UnixBuild, UNSTABLE),
("AMD64 Fedora Rawhide", "cstratak-fedora-rawhide-x86_64", FedoraBuild, UNSTABLE),
("AMD64 Fedora Rawhide Refleaks", "cstratak-fedora-rawhide-x86_64", UnixRefleakBuild, UNSTABLE),
("AMD64 Fedora Rawhide Clang", "cstratak-fedora-rawhide-x86_64", ClangUnixBuild, UNSTABLE),
("AMD64 Fedora Rawhide Clang Installed", "cstratak-fedora-rawhide-x86_64", ClangUnixInstalledBuild, UNSTABLE),
Expand All @@ -143,7 +144,7 @@ def get_builders(settings):
("AMD64 Arch Linux VintageParser", "pablogsal-arch-x86_64", UnixVintageParserBuild, UNSTABLE),
("AMD64 RHEL8 FIPS No Builtin Hashes", "cstratak-RHEL8-fips-x86_64", NoBuiltinHashesUnixBuild, UNSTABLE),
# Linux PPC64le
("PPC64LE Fedora Rawhide", "cstratak-fedora-rawhide-ppc64le", UnixBuild, UNSTABLE),
("PPC64LE Fedora Rawhide", "cstratak-fedora-rawhide-ppc64le", FedoraBuild, UNSTABLE),
("PPC64LE Fedora Rawhide Refleaks", "cstratak-fedora-rawhide-ppc64le", UnixRefleakBuild, UNSTABLE),
("PPC64LE Fedora Rawhide Clang", "cstratak-fedora-rawhide-ppc64le", ClangUnixBuild, UNSTABLE),
("PPC64LE Fedora Rawhide Clang Installed", "cstratak-fedora-rawhide-ppc64le", ClangUnixInstalledBuild, UNSTABLE),
Expand All @@ -152,7 +153,7 @@ def get_builders(settings):
# Linux aarch32
("ARM Raspbian", "gps-raspbian", UnixBuild, UNSTABLE),
# Linux aarch64
("aarch64 Fedora Rawhide", "cstratak-fedora-rawhide-aarch64", UnixBuild, UNSTABLE),
("aarch64 Fedora Rawhide", "cstratak-fedora-rawhide-aarch64", FedoraBuild, UNSTABLE),
("aarch64 Fedora Rawhide Refleaks", "cstratak-fedora-rawhide-aarch64", UnixRefleakBuild, UNSTABLE),
("aarch64 Fedora Rawhide Clang", "cstratak-fedora-rawhide-aarch64", ClangUnixBuild, UNSTABLE),
("aarch64 Fedora Rawhide Clang Installed", "cstratak-fedora-rawhide-aarch64", ClangUnixInstalledBuild, UNSTABLE),
Expand All @@ -171,7 +172,7 @@ def get_builders(settings):
("aarch64 RHEL8 LTO + PGO", "cstratak-RHEL8-aarch64", LTOPGONonDebugBuild, UNSTABLE),

# Linux other archs
("s390x Fedora Rawhide", "edelsohn-fedora-rawhide-z", UnixBuild, UNSTABLE),
("s390x Fedora Rawhide", "edelsohn-fedora-rawhide-z", FedoraBuild, UNSTABLE),
("s390x Fedora Rawhide Refleaks", "edelsohn-fedora-rawhide-z", UnixRefleakBuild, UNSTABLE),
("s390x Fedora Rawhide Clang", "edelsohn-fedora-rawhide-z", ClangUnixBuild, UNSTABLE),
("s390x Fedora Rawhide Clang Installed", "edelsohn-fedora-rawhide-z", ClangUnixInstalledBuild, UNSTABLE),
Expand Down
34 changes: 31 additions & 3 deletions master/custom/factories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ class AIXBuild(UnixBuild):
"--with-pydebug",
"--with-openssl=/opt/aixtools",
]


class AIXBuildWithXLC(UnixBuild):
buildersuffix = ".xlc"
configureFlags = [
Expand All @@ -278,7 +278,7 @@ class PGOUnixBuild(NonDebugUnixBuild):
buildersuffix = ".pgo"
configureFlags = ["--enable-optimizations"]
factory_tags = ["pgo"]

def setup(self, parallel, branch, *args, **kwargs):
# Only Python >3.10 has --with-readline=edit
if branch not in {'3.7', '3.8', '3.9'}:
Expand Down Expand Up @@ -363,6 +363,34 @@ class NoBuiltinHashesUnixBuildExceptBlake2(UnixBuild):
factory_tags = ["no-builtin-hashes-except-blake2"]


class FedoraBuild(UnixBuild):
# Build on Fedora or RHEL.
#
# Try to be as close as possible to the Fedora specfile used to build
# the RPM package:
# https://src.fedoraproject.org/rpms/python3.10/blob/rawhide/f/python3.10.spec
configureFlags = [
"--with-pydebug",
"--with-platlibdir=lib64",
Copy link

Choose a reason for hiding this comment

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

This only makes sense on 64bit arches.

Copy link
Contributor

Choose a reason for hiding this comment

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

All the Fedora and RHEL buildbots are 64 bits.

"--enable-ipv6",
"--enable-shared",
"--with-computed-gotos=yes",
"--with-dbmliborder=gdbm:ndbm:bdb",
"--with-system-expat",
"--with-system-ffi",
"--with-system-libmpdec",
Copy link

Choose a reason for hiding this comment

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

Adding options like this means we need to pull in the devel packages. Also, IIRC we can only use system mpdec in 3.10+

Copy link
Contributor

Choose a reason for hiding this comment

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

The devel packages are already in the buildbots

"--enable-loadable-sqlite-extensions",
"--with-dtrace",
"--with-lto",
"--with-ssl-default-suites=openssl",
"--without-static-libpython",
"--with-valgrind",
# Don't make a buildbot fail when pip/setuptools is updated in Python,
# whereas the buildbot uses older versions.
# "--with-wheel-pkg-dir=/usr/share/python-wheels/",
]


##############################################################################
############################ WINDOWS BUILDS ################################
##############################################################################
Expand Down