Skip to content

Commit b68aa0c

Browse files
author
Eric Griswold
authored
Merge pull request #321 from puppetlabs/P4DEVOPS-5741
(P4DEVOPS-5741) Update release packages with non-expiring GPG pubkey
2 parents d04d410 + 031f147 commit b68aa0c

17 files changed

+66
-74
lines changed

ci/create-packages

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ function install_deb_key_files {
141141
function install_rpm_key_files {
142142
project_target_repo=$(jq --raw-output .target_repo "$project_json")
143143

144-
rpm_gpg_source_file=RPM-GPG-KEY-puppet-2025-04-06.pub
145-
rpm_gpg_destination_file=RPM-GPG-KEY-2025-04-06-$project_target_repo-release
144+
rpm_gpg_source_file=RPM-GPG-KEY-puppet.pub
145+
rpm_gpg_destination_file=RPM-GPG-KEY-$project_target_repo-release
146146
rpm_gpg_source_path="$source_directory/$rpm_gpg_source_file"
147147
rpm_gpg_destination_path="$build_directory/etc/pki/rpm-gpg/$rpm_gpg_destination_file"
148148
install -D "$rpm_gpg_source_path" "$rpm_gpg_destination_path"

source/RPM-GPG-KEY-puppet-2025-04-06.pub

Lines changed: 0 additions & 31 deletions
This file was deleted.

source/RPM-GPG-KEY-puppet.asc

Lines changed: 0 additions & 29 deletions
This file was deleted.

source/RPM-GPG-KEY-puppet.pub

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
3+
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
51+
=RCth
52+
-----END PGP PUBLIC KEY BLOCK-----

source/keyring.gpg

-7.87 KB
Binary file not shown.

source/projects/puppet-release.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"project": "puppet-release",
33
"description": "Release packages for the Puppet repository",
44
"version": "1.0.0",
5-
"release": "33",
5+
"release": "34",
66

77
"license": "ASL 2.0",
88
"vendor": "Puppet, Inc. <[email protected]>",

source/projects/puppet-tools-release.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"project": "puppet-tools-release",
33
"description": "Release packages for the puppet-tools repository",
44
"version": "1.0.0",
5-
"release": "18",
5+
"release": "19",
66

77
"license": "ASL 2.0",
88
"vendor": "Puppet, Inc. <[email protected]>",

source/projects/puppet7-release.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"project": "puppet7-release",
33
"description": "Release packages for the Puppet 7 repository",
44
"version": "7.0.0",
5-
"release": "20",
5+
"release": "21",
66

77
"license": "ASL 2.0",
88
"vendor": "Puppet, Inc. <[email protected]>",

source/projects/puppet8-release.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"project": "puppet8-release",
33
"description": "Release packages for the Puppet 8 repository",
44
"version": "1.0.0",
5-
"release": "9",
5+
"release": "10",
66

77
"license": "ASL 2.0",
88
"vendor": "Puppet, Inc. <[email protected]>",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[puppet]
22
name=Puppet Repository __OS_NAME__ __OS_VERSION__ - $basearch
33
baseurl=http://yum.puppet.com/puppet/__OS_NAME__/__OS_VERSION__/$basearch
4-
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-2025-04-06-puppet-release
4+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet-release
55
enabled=1
66
gpgcheck=1

0 commit comments

Comments
 (0)