Merge pull request #297 from e-gris/remove_old_gpg_keys

(maint) Delete obsolete GPG-KEY from packages
puppetlabs · Nov 28, 2023 · e103d2f · e103d2f
2 parents 8b203b1 + ab97f8d
commit e103d2f
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 20 deletions.
diff --git a/ci/create-packages b/ci/create-packages
@@ -140,14 +140,6 @@ function install_rpm_key_files {
   rpm_gpg_source_path="$source_directory/$rpm_gpg_source_file"
   rpm_gpg_destination_path="$build_directory/etc/pki/rpm-gpg/$rpm_gpg_destination_file"
   install -D "$rpm_gpg_source_path" "$rpm_gpg_destination_path"
-
-  # We don't need to be shipping this anymore but need to remove it first from the
-  # packages
-  obsolete_rpm_gpg_source_file=RPM-GPG-KEY-puppet.asc
-  obsolete_rpm_gpg_destination_file=RPM-GPG-KEY-$project_target_repo-release
-  obsolete_rpm_gpg_source_path="$source_directory/$obsolete_rpm_gpg_source_file"
-  obsolete_rpm_gpg_destination_path="$build_directory/etc/pki/rpm-gpg/$obsolete_rpm_gpg_destination_file"
-  install -D "$obsolete_rpm_gpg_source_path" "$obsolete_rpm_gpg_destination_path"
 }
 
 ##

diff --git a/source/nightlies.puppet.com/puppet-nightly-release.repo.template b/source/nightlies.puppet.com/puppet-nightly-release.repo.template
@@ -2,6 +2,5 @@
 name=Puppet Nightly Repository __OS_NAME__ __OS_VERSION__ - $basearch
 baseurl=http://nightlies.puppet.com/yum/puppet-nightly/__OS_NAME__/__OS_VERSION__/$basearch
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-2025-04-06-puppet-nightly-release
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet-nightly-release
 enabled=1
 gpgcheck=1
diff --git a/source/nightlies.puppet.com/puppet7-nightly-release.repo.template b/source/nightlies.puppet.com/puppet7-nightly-release.repo.template
@@ -2,6 +2,5 @@
 name=Puppet 7 Nightly Repository __OS_NAME__ __OS_VERSION__ - $basearch
 baseurl=http://nightlies.puppet.com/yum/puppet7-nightly/__OS_NAME__/__OS_VERSION__/$basearch
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-2025-04-06-puppet7-nightly-release
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet7-nightly-release
 enabled=1
 gpgcheck=1
diff --git a/source/projects/puppet-nightly-release.json b/source/projects/puppet-nightly-release.json
@@ -2,7 +2,7 @@
   "project": "puppet-nightly-release",
   "description": "Release packages for the Puppet nightly repository",
   "version": "1.0.0",
-  "release": "30",
+  "release": "31",
 
   "license": "ASL 2.0",
   "vendor": "Puppet By Perforce <release@puppet.com>",

diff --git a/source/projects/puppet-release.json b/source/projects/puppet-release.json
@@ -2,7 +2,7 @@
   "project": "puppet-release",
   "description": "Release packages for the Puppet repository",
   "version": "1.0.0",
-  "release": "28",
+  "release": "29",
 
   "license": "ASL 2.0",
   "vendor": "Puppet, Inc. <release@puppet.com>",

diff --git a/source/projects/puppet-tools-release.json b/source/projects/puppet-tools-release.json
@@ -2,7 +2,7 @@
   "project": "puppet-tools-release",
   "description": "Release packages for the puppet-tools repository",
   "version": "1.0.0",
-  "release": "11",
+  "release": "12",
 
   "license": "ASL 2.0",
   "vendor": "Puppet, Inc. <release@puppet.com>",

diff --git a/source/projects/puppet7-nightly-release.json b/source/projects/puppet7-nightly-release.json
@@ -2,7 +2,7 @@
   "project": "puppet7-nightly-release",
   "description": "Release packages for the Puppet 7 nightly repository",
   "version": "1.0.0",
-  "release": "21",
+  "release": "22",
 
   "license": "ASL 2.0",
   "vendor": "Puppet, Inc. <release@puppet.com>",

diff --git a/source/projects/puppet7-release.json b/source/projects/puppet7-release.json
@@ -2,7 +2,7 @@
   "project": "puppet7-release",
   "description": "Release packages for the Puppet 7 repository",
   "version": "7.0.0",
-  "release": "14",
+  "release": "15",
 
   "license": "ASL 2.0",
   "vendor": "Puppet, Inc. <release@puppet.com>",

diff --git a/source/projects/puppet8-nightly-release.json b/source/projects/puppet8-nightly-release.json
@@ -2,7 +2,7 @@
   "project": "puppet8-nightly-release",
   "description": "Release packages for the Puppet 8 nightly repository",
   "version": "1.0.0",
-  "release": "6",
+  "release": "7",
 
   "license": "ASL 2.0",
   "vendor": "Puppet, Inc. <release@puppet.com>",

diff --git a/source/projects/puppet8-release.json b/source/projects/puppet8-release.json
@@ -2,7 +2,7 @@
   "project": "puppet8-release",
   "description": "Release packages for the Puppet 8 repository",
   "version": "1.0.0",
-  "release": "3",
+  "release": "4",
 
   "license": "ASL 2.0",
   "vendor": "Puppet, Inc. <release@puppet.com>",

diff --git a/source/yum.puppet.com/puppet-release.repo.template b/source/yum.puppet.com/puppet-release.repo.template
@@ -2,6 +2,5 @@
 name=Puppet Repository __OS_NAME__ __OS_VERSION__ - $basearch
 baseurl=http://yum.puppet.com/puppet/__OS_NAME__/__OS_VERSION__/$basearch
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-2025-04-06-puppet-release
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet-release
 enabled=1
 gpgcheck=1
diff --git a/source/yum.puppet.com/puppet-tools-release.repo.template b/source/yum.puppet.com/puppet-tools-release.repo.template
@@ -2,6 +2,5 @@
 name=Puppet Tools Repository __OS_NAME__ __OS_VERSION__ - $basearch
 baseurl=http://yum.puppet.com/puppet-tools/__OS_NAME__/__OS_VERSION__/$basearch
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-2025-04-06-puppet-tools-release
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet-tools-release
 enabled=1
 gpgcheck=1
diff --git a/source/yum.puppet.com/puppet7-release.repo.template b/source/yum.puppet.com/puppet7-release.repo.template
@@ -2,6 +2,5 @@
 name=Puppet 7 Repository __OS_NAME__ __OS_VERSION__ - $basearch
 baseurl=http://yum.puppet.com/puppet7/__OS_NAME__/__OS_VERSION__/$basearch
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-2025-04-06-puppet7-release
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-puppet7-release
 enabled=1
 gpgcheck=1