diff --git a/master/custom/workers.py b/master/custom/workers.py index 3719ddb3..20dde385 100644 --- a/master/custom/workers.py +++ b/master/custom/workers.py @@ -91,6 +91,8 @@ def get_workers(settings): name="cstratak-RHEL8-fips-x86_64", tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64', 'fips'], parallel_tests=6, + # Only 3.12+ for FIPS builder + not_branches=["3.9", "3.10", "3.11"], ), cpw( name="cstratak-CentOS9-x86_64", @@ -101,6 +103,8 @@ def get_workers(settings): name="cstratak-CentOS9-fips-x86_64", tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64', 'fips'], parallel_tests=6, + # Only 3.12+ for FIPS builder + not_branches=["3.9", "3.10", "3.11"], ), cpw( name="cstratak-fedora-rawhide-ppc64le", diff --git a/master/master.cfg b/master/master.cfg index b1ced2ba..9f43bf98 100644 --- a/master/master.cfg +++ b/master/master.cfg @@ -295,10 +295,6 @@ for branch_num, (git_url, branchname, git_branch) in enumerate(git_branches): if 'nogil' in tags and branchname in {"3.9", "3.10", "3.11", "3.12"}: continue - # Only 3.12+ for FIPS builders - if 'fips' in tags and branchname in {"3.9", "3.10", "3.11"}: - continue - if 'refleak' in tags: refleakbuildernames.append(buildername) else: