Skip to content

Commit e25b839

Browse files
committed
[RR] Force FIPS check on all rolling releases.
Going forward we need to run the FIPS check for every single update rather than just the "fips" ones as they will be integrated into the main rolling releases.
1 parent 23a704c commit e25b839

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

rolling-release-update.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -145,22 +145,21 @@ def check_for_fips_protected_changes(repo, branch, common_tag):
145145
print('[rolling release update] Latest RESF tag sha: ', latest_resf_sha)
146146
print(repo.git.show('--pretty="%H %s"', '-s', latest_resf_sha.decode()))
147147

148-
if 'fips' in rolling_product:
149-
print('[rolling release update] Checking for FIPS protected changes between the common tag and HEAD')
150-
shas_to_check = check_for_fips_protected_changes(repo, args.new_base_branch, latest_resf_sha)
151-
if shas_to_check and args.fips_override is False:
152-
for sha,dir in shas_to_check.items():
153-
print(f"## Commit {sha.decode()}")
154-
print('\'\'\'')
155-
dir_list = []
156-
for d in dir:
157-
dir_list.append(d.decode())
158-
print(repo.git.show(sha.decode(), dir_list))
159-
print('\'\'\'')
160-
print('[rolling release update] FIPS protected changes found between the common tag and HEAD')
161-
print('[rolling release update] Please Contact the CIQ FIPS / Security team for further instructions')
162-
print('[rolling release update] Exiting')
163-
exit(1)
148+
print('[rolling release update] Checking for FIPS protected changes between the common tag and HEAD')
149+
shas_to_check = check_for_fips_protected_changes(repo, args.new_base_branch, latest_resf_sha)
150+
if shas_to_check and args.fips_override is False:
151+
for sha,dir in shas_to_check.items():
152+
print(f"## Commit {sha.decode()}")
153+
print('\'\'\'')
154+
dir_list = []
155+
for d in dir:
156+
dir_list.append(d.decode())
157+
print(repo.git.show(sha.decode(), dir_list))
158+
print('\'\'\'')
159+
print('[rolling release update] FIPS protected changes found between the common tag and HEAD')
160+
print('[rolling release update] Please Contact the CIQ FIPS / Security team for further instructions')
161+
print('[rolling release update] Exiting')
162+
exit(1)
164163

165164

166165
print('[rolling release update] Checking out old rolling branch: ', args.old_rolling_branch)

0 commit comments

Comments
 (0)