From 3a2c57e6770915d67440a45a6ff48bbabaa2a0e5 Mon Sep 17 00:00:00 2001 From: Gabriel Nagy Date: Thu, 4 Feb 2021 18:48:01 +0200 Subject: [PATCH 1/2] Add both GPG keys when installing repos on SLES We recently updated packages to be signed with the new GPG key (puppet-20250406), so for the time being install both the old and the new GPG key. --- lib/beaker-puppet/install_utils/foss_utils.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/beaker-puppet/install_utils/foss_utils.rb b/lib/beaker-puppet/install_utils/foss_utils.rb index 9715a0d4..b5dc4ceb 100644 --- a/lib/beaker-puppet/install_utils/foss_utils.rb +++ b/lib/beaker-puppet/install_utils/foss_utils.rb @@ -1036,8 +1036,11 @@ def install_puppetlabs_release_repo_on( hosts, repo = nil, opts = options ) # package. We'll have to remember to update this block when # we update the signing keys if variant == 'sles' && version >= '11' - on host, "wget -O /tmp/puppet-gpg-key http://yum.puppetlabs.com/RPM-GPG-KEY-puppet" - on host, "rpm --import /tmp/puppet-gpg-key" + %w[puppet puppet-20250406].each do |gpg_key| + on host, "wget -O /tmp/#{gpg_key} http://yum.puppetlabs.com/RPM-GPG-KEY-#{gpg_key}" + on host, "rpm --import /tmp/#{gpg_key}" + on host, "rm -f /tmp/#{gpg_key}" + end end if variant == 'cisco_nexus' From e4bef0d94d1272dfa50112f1f955f74231c2c264 Mon Sep 17 00:00:00 2001 From: Gabriel Nagy Date: Fri, 5 Feb 2021 16:47:20 +0200 Subject: [PATCH 2/2] Fetch GPG keys from puppet.com and use HTTPS --- lib/beaker-puppet/install_utils/foss_utils.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/beaker-puppet/install_utils/foss_utils.rb b/lib/beaker-puppet/install_utils/foss_utils.rb index b5dc4ceb..acf95537 100644 --- a/lib/beaker-puppet/install_utils/foss_utils.rb +++ b/lib/beaker-puppet/install_utils/foss_utils.rb @@ -1037,7 +1037,7 @@ def install_puppetlabs_release_repo_on( hosts, repo = nil, opts = options ) # we update the signing keys if variant == 'sles' && version >= '11' %w[puppet puppet-20250406].each do |gpg_key| - on host, "wget -O /tmp/#{gpg_key} http://yum.puppetlabs.com/RPM-GPG-KEY-#{gpg_key}" + on host, "wget -O /tmp/#{gpg_key} https://yum.puppet.com/RPM-GPG-KEY-#{gpg_key}" on host, "rpm --import /tmp/#{gpg_key}" on host, "rm -f /tmp/#{gpg_key}" end