Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions rolling-release-update.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,22 +249,21 @@ def check_for_fips_protected_changes(repo, branch, common_tag):
print("[rolling release update] Common tag sha: ", common_sha)
print(repo.git.show('--pretty="%H %s"', "-s", common_sha.decode()))

if "fips" in rolling_product:
print("[rolling release update] Checking for FIPS protected changes between the common tag and HEAD")
shas_to_check = check_for_fips_protected_changes(repo, args.new_base_branch, common_sha)
if shas_to_check and args.fips_override is False:
for sha, dir in shas_to_check.items():
print(f"## Commit {sha.decode()}")
print("'''")
dir_list = []
for d in dir:
dir_list.append(d.decode())
print(repo.git.show(sha.decode(), dir_list))
print("'''")
print("[rolling release update] FIPS protected changes found between the common tag and HEAD")
print("[rolling release update] Please Contact the CIQ FIPS / Security team for further instructions")
print("[rolling release update] Exiting")
exit(1)
print("[rolling release update] Checking for FIPS protected changes between the common tag and HEAD")
shas_to_check = check_for_fips_protected_changes(repo, args.new_base_branch, common_sha)
if shas_to_check and args.fips_override is False:
for sha, dir in shas_to_check.items():
print(f"## Commit {sha.decode()}")
print("'''")
dir_list = []
for d in dir:
dir_list.append(d.decode())
print(repo.git.show(sha.decode(), dir_list))
print("'''")
print("[rolling release update] FIPS protected changes found between the common tag and HEAD")
print("[rolling release update] Please Contact the CIQ FIPS / Security team for further instructions")
print("[rolling release update] Exiting")
exit(1)

print("[rolling release update] Checking out old rolling branch: ", args.old_rolling_branch)
repo.git.checkout(args.old_rolling_branch)
Expand Down