From ab97f8df31f8ad6cc848e64d7b1146c3cdf36889 Mon Sep 17 00:00:00 2001 From: Eric Griswold Date: Tue, 3 Oct 2023 09:05:14 -0700 Subject: [PATCH] (maint) Delete obsolete GPG-KEY from packages --- ci/create-packages | 8 -------- .../puppet-nightly-release.repo.template | 1 - .../puppet7-nightly-release.repo.template | 1 - source/projects/puppet-nightly-release.json | 2 +- source/projects/puppet-release.json | 2 +- source/projects/puppet-tools-release.json | 2 +- source/projects/puppet7-nightly-release.json | 2 +- source/projects/puppet7-release.json | 2 +- source/projects/puppet8-nightly-release.json | 2 +- source/projects/puppet8-release.json | 2 +- source/yum.puppet.com/puppet-release.repo.template | 1 - source/yum.puppet.com/puppet-tools-release.repo.template | 1 - source/yum.puppet.com/puppet7-release.repo.template | 1 - 13 files changed, 7 insertions(+), 20 deletions(-) diff --git a/ci/create-packages b/ci/create-packages index aecba6b0..8dd07ada 100755 --- 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 index 000998ef..73c28db7 100644 --- 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 index fc80b2ee..77e06651 100644 --- 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 index daf5c428..14f732d9 100644 --- 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 ", diff --git a/source/projects/puppet-release.json b/source/projects/puppet-release.json index 11b32f35..92dba15f 100644 --- 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. ", diff --git a/source/projects/puppet-tools-release.json b/source/projects/puppet-tools-release.json index 5e7dd23b..095a2019 100644 --- 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. ", diff --git a/source/projects/puppet7-nightly-release.json b/source/projects/puppet7-nightly-release.json index 78bb1af1..46303f87 100644 --- 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. ", diff --git a/source/projects/puppet7-release.json b/source/projects/puppet7-release.json index a9e0b767..81bcb13e 100644 --- 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. ", diff --git a/source/projects/puppet8-nightly-release.json b/source/projects/puppet8-nightly-release.json index 9280a8b8..4708f5fd 100644 --- 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. ", diff --git a/source/projects/puppet8-release.json b/source/projects/puppet8-release.json index eecf144b..6b44968e 100644 --- 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. ", diff --git a/source/yum.puppet.com/puppet-release.repo.template b/source/yum.puppet.com/puppet-release.repo.template index 056181b1..da50102a 100644 --- 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 index 922b55f5..2995974c 100644 --- 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 index 6562c116..9c8e2e37 100644 --- 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