Remove the RHEL7 workers and configs (#518)

* Remove the RHEL7 builders and workers * Remove the RHEL7 configuration
python · Aug 19, 2024 · 261bfce · 261bfce
1 parent 1b6484a
commit 261bfce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 33 deletions.
diff --git a/master/custom/builders.py b/master/custom/builders.py
@@ -1,7 +1,6 @@
 from custom.factories import (
     UnixBuild,
     UnixPerfBuild,
-    RHEL7Build,
     RHEL8Build,
     CentOS9Build,
     FedoraStableBuild,
@@ -74,10 +73,6 @@
     ("AMD64 Fedora Stable Refleaks", "cstratak-fedora-stable-x86_64", UnixRefleakBuild),
     ("AMD64 Fedora Stable LTO", "cstratak-fedora-stable-x86_64", LTONonDebugUnixBuild),
     ("AMD64 Fedora Stable LTO + PGO", "cstratak-fedora-stable-x86_64", LTOPGONonDebugBuild),
-    ("AMD64 RHEL7", "cstratak-RHEL7-x86_64", RHEL7Build),
-    ("AMD64 RHEL7 Refleaks", "cstratak-RHEL7-x86_64", UnixRefleakBuild),
-    ("AMD64 RHEL7 LTO", "cstratak-RHEL7-x86_64", LTONonDebugUnixBuild),
-    ("AMD64 RHEL7 LTO + PGO", "cstratak-RHEL7-x86_64", LTOPGONonDebugBuild),
     ("AMD64 RHEL8", "cstratak-RHEL8-x86_64", RHEL8Build),
     ("AMD64 RHEL8 Refleaks", "cstratak-RHEL8-x86_64", UnixRefleakBuild),
     ("AMD64 RHEL8 LTO", "cstratak-RHEL8-x86_64", LTONonDebugUnixBuild),
@@ -113,11 +108,6 @@
     ("PPC64LE Fedora Stable LTO", "cstratak-fedora-stable-ppc64le", LTONonDebugUnixBuild),
     ("PPC64LE Fedora Stable LTO + PGO", "cstratak-fedora-stable-ppc64le", LTOPGONonDebugBuild),
 
-    ("PPC64LE RHEL7", "cstratak-RHEL7-ppc64le", RHEL7Build),
-    ("PPC64LE RHEL7 Refleaks", "cstratak-RHEL7-ppc64le", UnixRefleakBuild),
-    ("PPC64LE RHEL7 LTO", "cstratak-RHEL7-ppc64le", LTONonDebugUnixBuild),
-    ("PPC64LE RHEL7 LTO + PGO", "cstratak-RHEL7-ppc64le", LTOPGONonDebugBuild),
-
     ("PPC64LE RHEL8", "cstratak-RHEL8-ppc64le", RHEL8Build),
     ("PPC64LE RHEL8 Refleaks", "cstratak-RHEL8-ppc64le", UnixRefleakBuild),
     ("PPC64LE RHEL8 LTO", "cstratak-RHEL8-ppc64le", LTONonDebugUnixBuild),
@@ -344,14 +334,12 @@ def get_builders(settings):
     "AMD64 Windows11 Refleaks",
     "AMD64 Fedora Rawhide Refleaks",
     "AMD64 Fedora Stable Refleaks",
-    "AMD64 RHEL7 Refleaks",
     "AMD64 RHEL8 Refleaks",
     "AMD64 CentOS9 Refleaks",
     "AMD64 Fedora Rawhide NoGIL refleaks",
     # Linux PPC64LE
     "PPC64LE Fedora Rawhide Refleaks",
     "PPC64LE Fedora Stable Refleaks",
-    "PPC64LE RHEL7 Refleaks",
     "PPC64LE RHEL8 Refleaks",
     "PPC64LE CentOS9 Refleaks",
     "PPC64LE Fedora Rawhide NoGIL refleaks",

diff --git a/master/custom/factories.py b/master/custom/factories.py
@@ -380,8 +380,8 @@ class ClangLTOPGONonDebugBuild(NonDebugUnixBuild):
     factory_tags = ["lto", "pgo", "nondebug", "clang"]
 
 
-class RHEL7Build(UnixBuild):
-    # Build Python on 64-bit RHEL7.
+class RHEL8Build(UnixBuild):
+    # Build Python on 64-bit RHEL8.
     configureFlags = [
         "--with-pydebug",
         "--with-platlibdir=lib64",
@@ -395,13 +395,12 @@ class RHEL7Build(UnixBuild):
         "--enable-loadable-sqlite-extensions",
         "--with-ssl-default-suites=openssl",
         "--without-static-libpython",
+        "--with-lto",
         # Not all workers have dtrace installed
         # "--with-dtrace",
         # Not all workers have Valgrind headers installed
         # "--with-valgrind",
     ]
-    # Don't use --with-lto: building Python with LTO doesn't work
-    # with RHEL7 GCC.
 
     # Building Python out of tree: similar to what the specfile does, but
     # buildbot uses a single subdirectory, and the specfile uses two
@@ -413,13 +412,6 @@ class RHEL7Build(UnixBuild):
     build_out_of_tree = True
 
 
-class RHEL8Build(RHEL7Build):
-    # Build Python on 64-bit RHEL8.
-    configureFlags = RHEL7Build.configureFlags + [
-        "--with-lto",
-    ]
-
-
 class CentOS9Build(RHEL8Build):
     # Build on 64-bit CentOS Stream 9.
     # For now, it's the same as RHEL8, but later it may get different

diff --git a/master/custom/workers.py b/master/custom/workers.py
@@ -84,11 +84,6 @@ def get_workers(settings):
             tags=['linux', 'unix', 'fedora', 'amd64', 'x86-64'],
             parallel_tests=10,
         ),
-        cpw(
-            name="cstratak-RHEL7-x86_64",
-            tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64'],
-            parallel_tests=10,
-        ),
         cpw(
             name="cstratak-RHEL8-x86_64",
             tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64'],
@@ -119,11 +114,6 @@ def get_workers(settings):
             tags=['linux', 'unix', 'fedora', 'ppc64le'],
             parallel_tests=10,
         ),
-        cpw(
-            name="cstratak-RHEL7-ppc64le",
-            tags=['linux', 'unix', 'rhel', 'ppc64le'],
-            parallel_tests=10,
-        ),
         cpw(
             name="cstratak-RHEL8-ppc64le",
             tags=['linux', 'unix', 'rhel', 'ppc64le'],