beaker-pe 2.11.1 → 2.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 97bd6a543781b23b5db74e34d21bf25090df35b2
-  data.tar.gz: e4c3a2042167ac2d97cb32785eaf81f98fc15d56
+SHA256:
+  metadata.gz: e607f0adbf9ab049934cd0ce8b147e60e63fe642aa2cb78cbb92db28c72dc97b
+  data.tar.gz: 3f51752866e156e61b75d9fbca4f1d00cc916f68f7c197fd089d1cc5069649d0
 SHA512:
-  metadata.gz: 667cd0c54bb1f9aa9dd2e014322fb866d5313a793ce8ccdd9032bf3a66ea4c9951f5534dfd9d76b15b32a2278b3e69ea329e9531a890624d094d41e239447376
-  data.tar.gz: cdba8e5acabb39ee557c7d914349bc280e374283e293eb5c080fdaa3e9fde1c47def8ae881325a6a2f3b7a62c70adbd7cdd01225b6854fb66253f709ff9732a6
+  metadata.gz: 337a4164bcc7d6a5e73e515ee4b277a11b1a08524cda7158226303a229b962e4a65072aa2b51e968658580c8784c8f9ae25940e79c31e863c94b414a6096438a
+  data.tar.gz: 81e2989aa75682be94555e98273ce477d71384bdaa55ccbcc3a12d42030d512b6ed3382e04e0aa1d12fc447cd5c0e23f4b7a1dd4da67a1bbdabacc15da6606e7

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)

data/lib/beaker-pe/pe-client-tools/executable_helper.rb

@@ -127,6 +127,7 @@ module Beaker
               #TODO does this need to be more detailed to pass exit codes????
               # TODO make batch file direct output to separate file
               batch_contents =<<-EOS
+@echo off
 call #{tool_executable} #{args.join(' ')}
               EOS
 

data/lib/beaker-pe/pe-client-tools/install_helper.rb

@@ -47,6 +47,15 @@ module Beaker
               else
                 install_dev_repos_on(product, host, directory, '/tmp/repo_configs',{:dev_builds_url => opts[:dev_builds_url]})
                 host.install_package('pe-client-tools')
+                if host['platform'] =~ /cisco|centos|redhat|eos|sles|el-|fedora-(2[2-9]|3[0-9])/
+                  host.exec(Command.new('rpm -q pe-client-tools')) do |command|
+                    raise "Wanted version not installed." unless command.stdout =~ /-#{opts[:pe_client_tools_version]}/
+                  end
+                elsif host['platform'] =~ /ubuntu|debian|cumulus|huaweios/
+                  host.exec(Command.new("apt-cache policy pe-client-tools | sed -n -e 's/Installed: //p'")) do |command|
+                    raise "Wanted version not installed." unless command.stdout =~ /-#{opts[:pe_client_tools_version]}/
+                  end
+                end
             end
           end
         end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.11.1'
+        STRING = '2.11.6'
       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.1
+  version: 2.11.6
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2020-07-22 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!