beaker-pe 2.11.8 → 2.11.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 405e2df559bbc58f3276296b09461c2fbf9096b5d88061097a69dab3877ab982
-  data.tar.gz: 00479874f7c314e0f5e803ecdfab2ea0158dff21648b3a08f64f9ca1d67b80bf
+  metadata.gz: 278ceb769e990a1ceb6fc3a83f4869ce7913190123332936ef36fadddc17172d
+  data.tar.gz: 2a746b54a02eea0e43d693a99c75b6718cdd81b7142bd0148fcfa3ca12bbf1ff
 SHA512:
-  metadata.gz: 99b201517f264cdd54d12d535ed683d25f90ef86c7529b5190e63091b37088d5c63169df621b8aedabd5b98510f4a65bececcbbd3efa9286120c2705f4787789
-  data.tar.gz: 36f09dc7bb699212210eab2385bdcebda15194f5f4f0a9796599115e6076c94e7339fd67c87fc1e41d6069ba1154ef98a5e53197b457b9845fd49700880e5d01
+  metadata.gz: 8d3ee52a7aac5657a1bed7a1fb8483f5580a220dc4b2f4cd49a9a5dbed49845b16b18924534eed741d560f49131988a953c63111d9588c30aa547d15ee4e7ed8
+  data.tar.gz: ebbb6347e0403eb5bcf86725b8b2ed34aa8b7b8fa94d87630fff27a10e8e312ea42139be4fff85edbecc6a96b33de9401ce9f56de9a5d0d15acaad74c759897e

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/README.md

@@ -70,10 +70,10 @@ you'd like to provide your own hosts file, set the `CONFIG` environment variable
 # Release
 
 To release new versions, we use a
-[Jenkins job](https://cinext-jenkinsmaster-sre-prod-1.delivery.puppetlabs.net/job/qe_beaker-pe-gem_init-multijob_master/)
+[Jenkins job](https://cinext-jenkinsmaster-sre-prod-1.delivery.puppetlabs.net/job/qe_beaker-pe-gem_init-multijob_main/)
 (access to internal infrastructure will be required to view job).
 
-To release a new version (from the master branch), you'll need to just provide
+To release a new version (from the main branch), you'll need to just provide
 a new beaker-pe version number to the job, and you're off to the races.
 
 # Questions

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
 
@@ -184,6 +184,18 @@ module Beaker
           pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -x' : ''
           use_puppet_ca_cert = host[:use_puppet_ca_cert] || opts[:use_puppet_ca_cert]
 
+          # PE 2019.8.3 had a bug in the frictionless install of osx-10.14 and osx-10.15
+          # We need to do a bit of a hacky process to install the agent
+          if host['platform'] =~ /osx-10\.1(4|5)/ && (pe_version.eql?('2019.8.3') || pe_version.eql?('2019.8.4'))
+            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'
@@ -205,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
 
@@ -725,12 +737,16 @@ module Beaker
           hosts.each do |host|
             step "Configuring #{host} to use proxy" do
               @osmirror_host = "osmirror.delivery.puppetlabs.net"
+              puts "Grabbing IP for osmirror.delivery.puppetlabs.net"
               @osmirror_host_ip = IPSocket.getaddress(@osmirror_host)
               @delivery_host = "artifactory.delivery.puppetlabs.net"
+              puts "Grabbing IP for artifactory.delivery.puppetlabs.net"
               @delivery_host_ip = IPSocket.getaddress(@delivery_host)
               @test_forge_host = "api-forge-aio02-petest.puppet.com"
+              puts "Grabbing IP for api-forge-aio02-petest.puppet.com"
               @test_forge_host_ip = IPSocket.getaddress(@test_forge_host)
               @github_host = "github.com"
+              puts "Grabbing IP for github.com"
               @github_host_ip = IPSocket.getaddress(@github_host)
               @proxy_ip = @options[:proxy_ip]
               @proxy_hostname = @options[:proxy_hostname]
@@ -751,6 +767,9 @@ module Beaker
               on host, "iptables -A OUTPUT -p tcp -d #{@osmirror_host_ip} -j DROP"
               on host, "iptables -A OUTPUT -p tcp -d #{@delivery_host_ip} -j DROP"
               on host, "iptables -A OUTPUT -p tcp -d #{@test_forge_host_ip} -j DROP"
+              # The next two lines are for our production and test k8s test runners
+              on host, "iptables -A OUTPUT -p tcp -d 10.236.112.0/20 -j ACCEPT"
+              on host, "iptables -A OUTPUT -p tcp -d 10.220.0.0/16 -j ACCEPT"
               # The next two lines clear the rest of the internal puppet lan
               on host, "iptables -A OUTPUT -p tcp -d 10.16.0.0/16 -j ACCEPT"
               on host, "iptables -A OUTPUT -p tcp -d 10.32.0.0/16 -j ACCEPT"

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.11.8'
+        STRING = '2.11.13'
       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.8
+  version: 2.11.13
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec