Skip to content

Commit 691550a

Browse files
committed
TUN-9941: Use new GPG key for RPM builds
* TUN-9941: Use new GPG key for RPM builds Closes TUN-9941
1 parent 12c2a8e commit 691550a

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

release_pkgs.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -430,11 +430,17 @@ def parse_args():
430430
secondary_gpg_key_name = None
431431
if len(key_results) > 1:
432432
secondary_gpg_key_id, secondary_gpg_key_name = key_results[1]
433-
# Import RPM public keys (one or two)
434-
pkg_creator.import_rpm_key(args.gpg_public_key)
433+
434+
if args.args.gpg_private_key_2:
435+
print(f"signing RPM with secondary gpg_key: {secondary_gpg_key_id}")
436+
pkg_creator.import_rpm_key(args.gpg_public_key_2)
437+
else:
438+
print(f"signing RPM with primary gpg_key: {primary_gpg_key_name}")
439+
pkg_creator.import_rpm_key(args.gpg_public_key)
440+
435441

436442
pkg_uploader = PkgUploader(args.account, args.bucket, args.id, args.secret)
437-
print(f"signing with primary gpg_key: {primary_gpg_key_id} and secondary gpg_key: {secondary_gpg_key_id}")
443+
print(f"signing deb with primary gpg_key: {primary_gpg_key_id} and secondary gpg_key: {secondary_gpg_key_id}")
438444
create_deb_packaging(
439445
pkg_creator,
440446
pkg_uploader,

0 commit comments

Comments
 (0)