beaker-pe 2.11.13 → 2.11.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 278ceb769e990a1ceb6fc3a83f4869ce7913190123332936ef36fadddc17172d
-  data.tar.gz: 2a746b54a02eea0e43d693a99c75b6718cdd81b7142bd0148fcfa3ca12bbf1ff
+  metadata.gz: 8e9b569e250c94eb451c24254d071bb6fef6894f8a88c2935ce971fff81fe67b
+  data.tar.gz: abcf48ef49c6ce13258c4228ffc01ec4b53edac71a05617f5e35da6f0c3d28fe
 SHA512:
-  metadata.gz: 8d3ee52a7aac5657a1bed7a1fb8483f5580a220dc4b2f4cd49a9a5dbed49845b16b18924534eed741d560f49131988a953c63111d9588c30aa547d15ee4e7ed8
-  data.tar.gz: ebbb6347e0403eb5bcf86725b8b2ed34aa8b7b8fa94d87630fff27a10e8e312ea42139be4fff85edbecc6a96b33de9401ce9f56de9a5d0d15acaad74c759897e
+  metadata.gz: edd113d5a18fadcba0f7eb2a9e01bd4bd3335973cc2eca1a649e32cf52e1e7936c76430d8b5b27dda0b1ab2d0122d4d97baa4ed1869f902515e4e9f68b07f433
+  data.tar.gz: 7074073427dc6118f5e706eaf600dc8d72b15b8488cb12cc8515e4f52da20a1431fc7b8e7b314e2015e286c7c3d867ea28b7b25e2a3c8de3a25833b9945a7412

data/lib/beaker-pe/install/pe_utils.rb

@@ -368,9 +368,11 @@ module Beaker
             scp_to host, "#{path}/#{filename}#{extension}", "#{host['working_dir']}/#{filename}#{extension}"
             if extension =~ /gz/
               on host, "cd #{host['working_dir']}; gunzip #{filename}#{extension}"
+              gpg_key_overwrite(host, 'tarball')
             end
             if extension =~ /tar/
               on host, "cd #{host['working_dir']}; tar -xvf #{filename}.tar"
+              gpg_key_overwrite(host, 'tarball')
             end
           else
             if host['platform'] =~ /eos/
@@ -395,7 +397,37 @@ module Beaker
                 command_file_push = "curl -L #{curlopts}#{path}/"
               end
               on host, "cd #{host['working_dir']}; #{command_file_push}#{filename}#{extension} | #{unpack}"
+              gpg_key_overwrite(host, 'tarball')
+            end
+          end
+        end
+
+        #PE-32680, GPG expired on older PE versions, need to update with a new GPG key on the primary server
+        #only affects PE versions 2019.8.4 and earlier, and only needed for debian, ubuntu, and sles agent platforms
+        # @param [Host] host to see if we need to update the gpg key
+        # @param [String] location of the GPG key we intend to overwrite
+        # If someone is using this gem and is not on the PE private network, they need to download the new private GPG key and host
+        # it somewhere, then set the URL as an enviromental variable GPG_URL.
+        def gpg_key_overwrite(host, location)
+          gpg_url = ENV['GPG_URL'] || 'https://artifactory.delivery.puppetlabs.net/artifactory/generic__local/extended_gpg_key.asc'
+          case location
+          when 'tarball'
+            path_to_gpg_key = "#{host['working_dir']}/#{host['dist']}/packages/GPG-KEY-puppet"
+          when 'pe_repo'
+            path_to_gpg_key = '/opt/puppetlabs/puppet/modules/pe_repo/files/GPG-KEY-puppet'
+          when 'pe_repo_env'
+            path_to_gpg_key = '/opt/puppetlabs/server/data/environments/enterprise/modules/pe_repo/files/GPG-KEY-puppet'
+          else
+            raise(StandardError, "gpg_key_overwrite requires a valid location: tarball, or pe_repo. #{location} was supplied")
+          end
 
+          if (host['roles'].include?('master') || host['roles'].include?('pe_postgres')) && version_is_less(host[:pe_ver], '2019.8.5') && hosts.any? {|agent| agent['platform'] =~ /(debian)|(ubuntu)|(sles)/}
+            on(master, "rm -f #{path_to_gpg_key}")
+            on(master, "curl #{gpg_url} --output #{path_to_gpg_key}")
+            if location == 'pe_repo'
+              gpg_key_overwrite(host, 'pe_repo_env')
+            elsif location == 'pe_repo_env'
+              on master, puppet('agent -t'), :acceptable_exit_codes => [0,2]
             end
           end
         end
@@ -439,7 +471,6 @@ module Beaker
           # For some platforms (e.g, redhatfips), packaging_platfrom is set and should
           # be used as the primary source of truth for the platform string.
           platform = host['packaging_platform'] || host['platform']
-
           # We don't have a separate AIX 7.2 build, so it is
           # classified as 7.1 for pe_repo purposes
           if platform == "aix-7.2-power"
@@ -1998,6 +2029,8 @@ module Beaker
                end
              end
 
+             gpg_key_overwrite(master, 'pe_repo')
+
              step "Install agents" do
                block_on(agent_nodes, {:run_in_parallel => true}) do |host|
                  install_ca_cert_on(host, opts)

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.11.13'
+        STRING = '2.11.14'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.11.13
+  version: 2.11.14
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec