Skip to content

Commit a80daa1

Browse files
authored
Skip old branches for FIPS builders (#610)
This should fix the ineffective change made in #558 (9f84063) The `tags` in master.cfg are *factory* tags, not *worker* tags. Skip old branches using `not_branches` instead. Note that these are unstable and failing, except “Only Blake2” which is stable, and only fails on 3.11. (The 3.9 3.10 builders are stable and passing, but not very interesting at this point.)
1 parent 64ac1c4 commit a80daa1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

master/custom/workers.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ def get_workers(settings):
9191
name="cstratak-RHEL8-fips-x86_64",
9292
tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64', 'fips'],
9393
parallel_tests=6,
94+
# Only 3.12+ for FIPS builder
95+
not_branches=["3.9", "3.10", "3.11"],
9496
),
9597
cpw(
9698
name="cstratak-CentOS9-x86_64",
@@ -101,6 +103,8 @@ def get_workers(settings):
101103
name="cstratak-CentOS9-fips-x86_64",
102104
tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64', 'fips'],
103105
parallel_tests=6,
106+
# Only 3.12+ for FIPS builder
107+
not_branches=["3.9", "3.10", "3.11"],
104108
),
105109
cpw(
106110
name="cstratak-fedora-rawhide-ppc64le",

master/master.cfg

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,6 @@ for branch_num, (git_url, branchname, git_branch) in enumerate(git_branches):
295295
if 'nogil' in tags and branchname in {"3.9", "3.10", "3.11", "3.12"}:
296296
continue
297297

298-
# Only 3.12+ for FIPS builders
299-
if 'fips' in tags and branchname in {"3.9", "3.10", "3.11"}:
300-
continue
301-
302298
if 'refleak' in tags:
303299
refleakbuildernames.append(buildername)
304300
else:

0 commit comments

Comments
 (0)