Skip to content

Commit 261bfce

Browse files
authored
Remove the RHEL7 workers and configs (#518)
* Remove the RHEL7 builders and workers * Remove the RHEL7 configuration
1 parent 1b6484a commit 261bfce

File tree

3 files changed

+3
-33
lines changed

3 files changed

+3
-33
lines changed

master/custom/builders.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from custom.factories import (
22
UnixBuild,
33
UnixPerfBuild,
4-
RHEL7Build,
54
RHEL8Build,
65
CentOS9Build,
76
FedoraStableBuild,
@@ -74,10 +73,6 @@
7473
("AMD64 Fedora Stable Refleaks", "cstratak-fedora-stable-x86_64", UnixRefleakBuild),
7574
("AMD64 Fedora Stable LTO", "cstratak-fedora-stable-x86_64", LTONonDebugUnixBuild),
7675
("AMD64 Fedora Stable LTO + PGO", "cstratak-fedora-stable-x86_64", LTOPGONonDebugBuild),
77-
("AMD64 RHEL7", "cstratak-RHEL7-x86_64", RHEL7Build),
78-
("AMD64 RHEL7 Refleaks", "cstratak-RHEL7-x86_64", UnixRefleakBuild),
79-
("AMD64 RHEL7 LTO", "cstratak-RHEL7-x86_64", LTONonDebugUnixBuild),
80-
("AMD64 RHEL7 LTO + PGO", "cstratak-RHEL7-x86_64", LTOPGONonDebugBuild),
8176
("AMD64 RHEL8", "cstratak-RHEL8-x86_64", RHEL8Build),
8277
("AMD64 RHEL8 Refleaks", "cstratak-RHEL8-x86_64", UnixRefleakBuild),
8378
("AMD64 RHEL8 LTO", "cstratak-RHEL8-x86_64", LTONonDebugUnixBuild),
@@ -113,11 +108,6 @@
113108
("PPC64LE Fedora Stable LTO", "cstratak-fedora-stable-ppc64le", LTONonDebugUnixBuild),
114109
("PPC64LE Fedora Stable LTO + PGO", "cstratak-fedora-stable-ppc64le", LTOPGONonDebugBuild),
115110

116-
("PPC64LE RHEL7", "cstratak-RHEL7-ppc64le", RHEL7Build),
117-
("PPC64LE RHEL7 Refleaks", "cstratak-RHEL7-ppc64le", UnixRefleakBuild),
118-
("PPC64LE RHEL7 LTO", "cstratak-RHEL7-ppc64le", LTONonDebugUnixBuild),
119-
("PPC64LE RHEL7 LTO + PGO", "cstratak-RHEL7-ppc64le", LTOPGONonDebugBuild),
120-
121111
("PPC64LE RHEL8", "cstratak-RHEL8-ppc64le", RHEL8Build),
122112
("PPC64LE RHEL8 Refleaks", "cstratak-RHEL8-ppc64le", UnixRefleakBuild),
123113
("PPC64LE RHEL8 LTO", "cstratak-RHEL8-ppc64le", LTONonDebugUnixBuild),
@@ -344,14 +334,12 @@ def get_builders(settings):
344334
"AMD64 Windows11 Refleaks",
345335
"AMD64 Fedora Rawhide Refleaks",
346336
"AMD64 Fedora Stable Refleaks",
347-
"AMD64 RHEL7 Refleaks",
348337
"AMD64 RHEL8 Refleaks",
349338
"AMD64 CentOS9 Refleaks",
350339
"AMD64 Fedora Rawhide NoGIL refleaks",
351340
# Linux PPC64LE
352341
"PPC64LE Fedora Rawhide Refleaks",
353342
"PPC64LE Fedora Stable Refleaks",
354-
"PPC64LE RHEL7 Refleaks",
355343
"PPC64LE RHEL8 Refleaks",
356344
"PPC64LE CentOS9 Refleaks",
357345
"PPC64LE Fedora Rawhide NoGIL refleaks",

master/custom/factories.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,8 @@ class ClangLTOPGONonDebugBuild(NonDebugUnixBuild):
380380
factory_tags = ["lto", "pgo", "nondebug", "clang"]
381381

382382

383-
class RHEL7Build(UnixBuild):
384-
# Build Python on 64-bit RHEL7.
383+
class RHEL8Build(UnixBuild):
384+
# Build Python on 64-bit RHEL8.
385385
configureFlags = [
386386
"--with-pydebug",
387387
"--with-platlibdir=lib64",
@@ -395,13 +395,12 @@ class RHEL7Build(UnixBuild):
395395
"--enable-loadable-sqlite-extensions",
396396
"--with-ssl-default-suites=openssl",
397397
"--without-static-libpython",
398+
"--with-lto",
398399
# Not all workers have dtrace installed
399400
# "--with-dtrace",
400401
# Not all workers have Valgrind headers installed
401402
# "--with-valgrind",
402403
]
403-
# Don't use --with-lto: building Python with LTO doesn't work
404-
# with RHEL7 GCC.
405404

406405
# Building Python out of tree: similar to what the specfile does, but
407406
# buildbot uses a single subdirectory, and the specfile uses two
@@ -413,13 +412,6 @@ class RHEL7Build(UnixBuild):
413412
build_out_of_tree = True
414413

415414

416-
class RHEL8Build(RHEL7Build):
417-
# Build Python on 64-bit RHEL8.
418-
configureFlags = RHEL7Build.configureFlags + [
419-
"--with-lto",
420-
]
421-
422-
423415
class CentOS9Build(RHEL8Build):
424416
# Build on 64-bit CentOS Stream 9.
425417
# For now, it's the same as RHEL8, but later it may get different

master/custom/workers.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@ def get_workers(settings):
8484
tags=['linux', 'unix', 'fedora', 'amd64', 'x86-64'],
8585
parallel_tests=10,
8686
),
87-
cpw(
88-
name="cstratak-RHEL7-x86_64",
89-
tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64'],
90-
parallel_tests=10,
91-
),
9287
cpw(
9388
name="cstratak-RHEL8-x86_64",
9489
tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64'],
@@ -119,11 +114,6 @@ def get_workers(settings):
119114
tags=['linux', 'unix', 'fedora', 'ppc64le'],
120115
parallel_tests=10,
121116
),
122-
cpw(
123-
name="cstratak-RHEL7-ppc64le",
124-
tags=['linux', 'unix', 'rhel', 'ppc64le'],
125-
parallel_tests=10,
126-
),
127117
cpw(
128118
name="cstratak-RHEL8-ppc64le",
129119
tags=['linux', 'unix', 'rhel', 'ppc64le'],

0 commit comments

Comments
 (0)