beaker-pe 2.11.0 → 2.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d489d0aec55279c22ee7c655f3becf5d1dd8b04c
-  data.tar.gz: 0097776b4d29049f559cbc7812e052c7c902c6c2
+SHA256:
+  metadata.gz: 6b980f0786d5843b28521338cf71f98d33798f2f59c8e5068185a419dc0d1e27
+  data.tar.gz: c754f34e0e63b69f51ea3014091100cd68ef75112bab6952b4ea90ab02123d7c
 SHA512:
-  metadata.gz: 13203aa9ab9d23a07434ce414696c35aa4e513a0488a10eb0a0a842fedb554e6fe1f6dc2c67c56bd204396a8a2604aa1fc192a9f2f0fddba3eee74680810ff08
-  data.tar.gz: cfa8218a3cf30dbeff6c2e41ae9601505e709604451ab447a47816ff036d6a9ad6132eea0bc1e3abba6de10926d637f98d61c0ee164c598786b82bb3d609bc20
+  metadata.gz: f02d963ffad85af682eb35300027e72b3da36dd9b306a2eb17079e9dc34941514cefe4c2776176d430b7a3f89492bcb8a847d7077990415b799b87c555b6b693
+  data.tar.gz: 69ac13034a03600fd41932640c74e73d6d75e804b1376821d2e22e04d5b0ab4d6a0fa5f3fce272b39166b07d5b9ba63819c675d0f522bcabc5a49a98824d14ce

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

data/beaker-pe.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14.0'
-  s.add_development_dependency 'rake', '~> 10.1'
+  s.add_development_dependency 'rake', '~> 12.3.3'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'pry', '~> 0.10'
 

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

@@ -292,7 +292,7 @@ module Beaker
               fetch_and_push_pe(host, path, filename, extension)
             else
               curlopts = opts[:use_proxy] ? " --proxy #{opts[:proxy_hostname]}:3128" : ""
-              on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}#{curlopts}"
+              on host, "cd #{host['working_dir']}; curl -L -O #{path}/#{filename}#{extension}#{curlopts}"
             end
           end
         end
@@ -328,7 +328,7 @@ module Beaker
               on host, "cd #{host['working_dir']}; chmod 644 #{filename}#{extension}"
             elsif host.is_cygwin?
               curlopts = opts[:use_proxy] ? " --proxy #{opts[:proxy_hostname]}:3128" : ""
-              on host, "cd #{host['working_dir']}; curl -O #{path}/#{filename}#{extension}#{curlopts}"
+              on host, "cd #{host['working_dir']}; curl -L -O #{path}/#{filename}#{extension}#{curlopts}"
             else
               on host, powershell("$webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('#{path}/#{filename}#{extension}','#{host['working_dir']}\\#{filename}#{extension}')")
             end
@@ -381,7 +381,7 @@ module Beaker
                 command_file_push = 'cat '
               else
                 curlopts = opts[:use_proxy] ? "--proxy #{opts[:proxy_hostname]}:3128 " : ""
-                command_file_push = "curl #{curlopts}#{path}/"
+                command_file_push = "curl -L #{curlopts}#{path}/"
               end
               on host, "cd #{host['working_dir']}; #{command_file_push}#{filename}#{extension} | #{unpack}"
 
@@ -661,7 +661,7 @@ module Beaker
           register_feature_flags!(opts)
           generate_installer_conf_file_for(master, all_hosts, opts)
           step "Install PE on master" do
-            on master, installer_cmd(master, opts)
+            on master, installer_cmd(master, opts) if master['template'] !~ /-preload/
           end
 
           step "Stop agent on master" do
@@ -690,7 +690,7 @@ module Beaker
             step "Configuring #{host} to use proxy" do
               @osmirror_host = "osmirror.delivery.puppetlabs.net"
               @osmirror_host_ip = IPSocket.getaddress(@osmirror_host)
-              @delivery_host = "enterprise.delivery.puppetlabs.net"
+              @delivery_host = "artifactory.delivery.puppetlabs.net"
               @delivery_host_ip = IPSocket.getaddress(@delivery_host)
               @test_forge_host = "api-forge-aio02-petest.puppet.com"
               @test_forge_host_ip = IPSocket.getaddress(@test_forge_host)
@@ -738,9 +738,11 @@ module Beaker
               on host, "curl --proxy #{@proxy_hostname}:3128 http://#{@osmirror_host}", :acceptable_exit_codes => [0]
               # Verify we can't reach it without the proxy
               on host, "curl -k http://#{@osmirror_host} -m 5", :acceptable_exit_codes => [28]
+              # For ubuntu we configure Apt to use a proxy globally
               if host.host_hash[:platform].include?("ubuntu")
                 on host, "echo 'Acquire::http::Proxy \"http://'#{@proxy_hostname}':3128/\";' >> /etc/apt/apt.conf"
                 on host, "echo 'Acquire::https::Proxy \"http://'#{@proxy_hostname}':3128/\";' >> /etc/apt/apt.conf"
+              # For SLES we configure ENV variables to use a proxy, then set no_proxy on master and possible CM
               elsif host.host_hash[:platform].include?("sles")
                 on host, 'rm /etc/sysconfig/proxy'
                 on host, 'echo "PROXY_ENABLED=\"yes\"" >> /etc/sysconfig/proxy'
@@ -752,12 +754,9 @@ module Beaker
                   no_proxy_list.concat(",#{compile_master}")
                 end
                 on host, "echo \"NO_PROXY='#{no_proxy_list}'\" >> /etc/sysconfig/proxy"
+              # For Redhat/Centos we configre Yum globally to use a proxy
               else
-                #Hacky work around until we configure puppet_enteprise::repo::config to set proxy=_none_ in the puppet_enteprrise.repo
-                repo_list = on(host, "ls /etc/yum.repos.d/").output.strip.split("\n")
-                repo_list.each do |repo|
-                  on host, "echo \"proxy=http://#{@proxy_hostname}:3128\" >> /etc/yum.repos.d/#{repo}"
-                end
+                on host, "echo 'proxy=http://#{@proxy_hostname}:3128' >> /etc/yum.conf"
               end
             end
           end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.11.0'
+        STRING = '2.11.5'
       end
 
     end

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

@@ -646,29 +646,6 @@ describe ClassMixedWithDSLInstallUtils do
     def slice_installer_options(host)
       host.host_hash.select { |k,v| [ :pe_installer_conf_file, :pe_installer_conf_setting].include?(k) }
     end
-
-    context 'when version < 2016.2.0' do
-      let(:pe_ver) { '3.8.5' }
-
-      it 'sets legacy settings' do
-        expect(slice_installer_options(host)).to eq(legacy_settings)
-      end
-    end
-
-    context 'when version >= 2016.2.0' do
-      let (:pe_ver) { '2016.2.0' }
-
-      it 'test use_meep?' do
-        expect(subject.use_meep?('3.8.5')).to eq(false)
-        expect(subject.use_meep?('2016.1.2')).to eq(false)
-        expect(subject.use_meep?('2016.2.0')).to eq(true)
-        expect(subject.use_meep?('2016.2.0-rc1-gabcdef')).to eq(true)
-      end
-
-      it 'sets meep settings' do
-        expect(slice_installer_options(host)).to eq(meep_settings)
-      end
-    end
   end
 
   RSpec.shared_examples 'test flag' do |flag_name|
@@ -1114,7 +1091,7 @@ describe ClassMixedWithDSLInstallUtils do
       path = unixhost['pe_dir']
       filename = "#{ unixhost['dist'] }"
       extension = '.tar'
-      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl #{ path }/#{ filename }#{ extension } | tar -xvf -" ).once
+      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl -L #{ path }/#{ filename }#{ extension } | tar -xvf -" ).once
       subject.fetch_pe( [unixhost], {} )
     end
 
@@ -1144,7 +1121,7 @@ describe ClassMixedWithDSLInstallUtils do
       path = unixhost['pe_dir']
       filename = "#{ unixhost['dist'] }"
       extension = '.tar.gz'
-      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl #{ path }/#{ filename }#{ extension } | gunzip | tar -xvf -" ).once
+      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl -L #{ path }/#{ filename }#{ extension } | gunzip | tar -xvf -" ).once
       subject.fetch_pe( [unixhost], {} )
     end
 
@@ -1190,7 +1167,7 @@ describe ClassMixedWithDSLInstallUtils do
       path = machost['pe_dir']
       filename = "#{ machost['dist'] }"
       extension = '.dmg'
-      expect( subject ).to receive( :on ).with( machost, "cd #{ machost['working_dir'] }; curl -O #{ path }/#{ filename }#{ extension }" ).once
+      expect( subject ).to receive( :on ).with( machost, "cd #{ machost['working_dir'] }; curl -L -O #{ path }/#{ filename }#{ extension }" ).once
       subject.fetch_pe( [machost], {} )
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.5
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".simplecov"
@@ -306,8 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Beaker PE DSL Helpers!