beaker-pe 2.11.11 → 2.11.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a601533eb75af4da03d301dbe3649a12f5123dc1ed962e9aeedd76069563bf51
-  data.tar.gz: 2b530fbdf6d59a6743576e4c7c4820c28d193d7dcf9cc403a5fcbe1929e21fc5
+  metadata.gz: 324a9d18893ffc429e8ac5dd4539df131a61b3317c0993ce5c69945d836dea14
+  data.tar.gz: 283b5c762fb1f8918a46f743cd07f0b700cb28c94046a9f1f0b99efeea068c38
 SHA512:
-  metadata.gz: f340e1fa5d7e7e3a495a2505ee207f4f69d2a67df84ff698bd57bf9dae0213d3b52ee7b6daa30449b5e9e0720f541029276cad4618a249b714eb548aaf587cfc
-  data.tar.gz: aea775bc25fc35d26ab14d471818c50acb52a6f27557c4f1fd31214568d8bee1fd4981e0ba68e6a398c965063a8698c49b3a20eaa52ffa98892c4f2c9a76e673
+  metadata.gz: 07bd5f9ef9c47d1af9c7b2df095ecdcc0e3c190181a9043171428c43685f1d7fe238e02886b120bdb4e950ed483084ea09b95fcd5742c2fc2bb32740ba967823
+  data.tar.gz: dbc42764185aad94c793e0d66c6007a3db6b29e5b71e4e07b853196526132a6cb74ad95565f354a57016e4192a8a7af80684a8f6136c3ca8c3dedf21e0205d2f

data/Gemfile

@@ -15,6 +15,7 @@ end
 group :acceptance_testing do
   gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0')
   gem "beaker-vmpooler", *location_for(ENV['BEAKER_VMPOOLER_VERSION'] || '~> 1.3')
+  gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.8')
 end
 
 gem "scooter", *location_for(ENV['SCOOTER_VERSION'] || '~> 4.3')

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

@@ -139,7 +139,7 @@ module Beaker
         #Return true if tlsv1 protocol needs to be enforced
         #param [Host] the host
         def require_tlsv1?(host)
-          tlsv1_platforms = [/aix/, /el-5/, /solaris-1[0,1]-[i,x]/, /sles-11/,/windows-2008/]
+          tlsv1_platforms = [/el-5/, /solaris-1[0,1]-[i,x]/, /sles-11/,/windows-2008/]
           return tlsv1_platforms.any? {|platform_regex| host['platform'] =~ platform_regex}
         end
 
@@ -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'
@@ -211,7 +217,7 @@ module Beaker
             end
             if use_puppet_ca_cert
               curl_opts << '--cacert /etc/puppetlabs/puppet/ssl/certs/ca.pem'
-            elsif host['platform'] !~ /aix/
+            else
               curl_opts << '-k'
             end
 
@@ -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,10 @@ module Beaker
                end
              end
 
+             if hosts.any? {|host| host['roles'].include?('pe_postgres')}
+               gpg_key_overwrite(pe_postgres, '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.11'
+        STRING = '2.11.15'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -263,7 +263,7 @@ describe ClassMixedWithDSLInstallUtils do
       expecting = [
         "FRICTIONLESS_TRACE='true'",
         "export FRICTIONLESS_TRACE",
-        "cd /tmp && curl -O --tlsv1 https://testmaster:8140/packages/current/install.bash && bash install.bash"
+        "cd /tmp && curl -O --tlsv1 -k https://testmaster:8140/packages/current/install.bash && bash install.bash"
       ].join("; ")
 
       expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq(expecting)

metadata

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