beaker-pe 2.11.12 → 2.11.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ea72482bc472e4a0559e8f1c451de554f2c35c1e88337280c1c5e79b8dbabf1
-  data.tar.gz: f07017a866d781a895481347ec738da1e42a1e07fc1d7aeed50945e7cc0f6a02
+  metadata.gz: 52adaf3c402a17eead36d731fb3f999b86abef884cec5cc575e481ac8e3e8c9f
+  data.tar.gz: fc2acec40bf906655511f3c918345f3a425ac5bd98dc522791e912d8a0dc166a
 SHA512:
-  metadata.gz: 27d77ade9aabcc07859a6aa09e54ce9c7be605e527531dc58f5ed75c1119590de9a0e59aece829d6616db4d0a34cac7e83c5e207ac484d101ca1ce35008b7002
-  data.tar.gz: a782f6043fc83b976949c45899ef95914b41b74e5d2515458081c34e91b3cba84455278f24fa9d52c9bade9afa913fa04063c1d41f9ff04e08ed5d63b6e8846b
+  metadata.gz: 1d6a1cd59d1d3f3e9a00e363c60b9703b526bf77dcda4523ad830bd654ef02d9187c80f50828c913d51ba247da14fca0f2c8e0c5af2530f534c07fe6ad40925a
+  data.tar.gz: 1dbbd8949c123c925cebcee3c82aee46a924433a9c829887e45916bdd040fb65e6e944e7ad8a2f6a5f384a49105597d809834b6262dffc25cc734a6b931b3bb1

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

@@ -190,6 +190,12 @@ module Beaker
             return "curl -kO https://#{downloadhost}:8140/packages/current/#{host['platform']}.bash && bash #{host['platform']}.bash"
           end
 
+          # PE 2019.8.5 has an issue with the GPG key that does not allow el-5 and sles-11 to install the puppet-agent
+          if host['platform'] =~ /(el-5)|(sles-11)/ && pe_version.eql?('2019.8.5')
+            on(host, "curl --remote-name --location http://yum.puppet.com/RPM-GPG-KEY-puppet-20250406")
+            on(host, "rpm --import RPM-GPG-KEY-puppet-20250406")
+          end
+
           if host['platform'] =~ /windows/ then
             if use_puppet_ca_cert
               frictionless_install_opts << '-UsePuppetCA'
@@ -362,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/
@@ -389,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(host, "rm -f #{path_to_gpg_key}")
+            on(host, "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 host, puppet('agent -t'), :acceptable_exit_codes => [0,2]
             end
           end
         end
@@ -433,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"
@@ -1992,6 +2029,16 @@ module Beaker
                end
              end
 
+            # pe_postgres node needs new gpg key
+            if hosts.any? {|host| host['roles'].include?('pe_postgres')}
+              gpg_key_overwrite(pe_postgres, 'pe_repo')
+            end
+
+            # pe_repo needs updated with gpg key if sles/ubuntu/debian agent will be used
+            if hosts.any? {|host| host['platform'] =~ /(sles)|(ubuntu)|(debian)/}
+              gpg_key_overwrite(master, 'pe_repo')
+            end
+
              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.12'
+        STRING = '2.11.16'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.11.12
+  version: 2.11.16
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec