beaker-pe 1.35.0 → 1.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90ed458292d1bb6544717ab386c9a85410c79b1b
-  data.tar.gz: 95447c5d837868bd09b2c97e71c280cae245ca09
+  metadata.gz: a17dc91d56e07d14fd5547212a846aa002361d91
+  data.tar.gz: a9b79e20ba95a43f3250a654389d9ff28f15ce3b
 SHA512:
-  metadata.gz: 8fccbd15d0d9972742f4b38fdda770552a44e38cbff0f286b7559a595499ed883917fea55999d5676793608feced6e43418dba9519afcf173c6ce7b8ff487ecd
-  data.tar.gz: 1c7303c454a4bf2905d8be138b5679fd1443a63f3fd581caed7da670916a6fda610a319cc78d5aa7574493d7f38f8e308f8da1eebb1981a9f1eac0a382450d54
+  metadata.gz: 53bb7ca46de519fd5b8c96649e58a04f44befc203eaa63d187f29e585d312543b7f9b729005f08e8331f9b996f639dafac842eaf42485c0386b656a6bde0be8d
+  data.tar.gz: 65316498104bb3e13ef92afbb44b33dc017fa2df9b0405e14f876fc3121809d9bf45d9457ebc0e40a9bbe8adb8eaa3fa9faa89941427f0bf4c81072956b3672f

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

@@ -148,6 +148,13 @@ module Beaker
             end
           end
 
+          # pe_repo also supports flags that will determine what happens during the frictionless install
+          # Current support in beaker-pe is for:
+          # --puppet-service-debug, when running puppet service enable, the debug flag is passed into puppt service
+          if host[:puppet_service_debug_flag] == true
+            frictionless_install_opts << '--puppet-service-debug'
+          end
+
           # If this is an agent node configured to connect to the loadbalancer
           # using 'lb_connect' role, then use loadbalancer in the download url
           # instead of master

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.35.0'
+        STRING = '1.36.0'
       end
 
     end

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

@@ -314,6 +314,18 @@ describe ClassMixedWithDSLInstallUtils do
 
       expect( subject.frictionless_agent_installer_cmd( lb_test_hosts[3], {}, '2016.4.0' ) ).to eq(expecting)
     end
+
+    it 'generates a unix PE frictionless install command with the puppet service debug flag' do
+      host[:puppet_service_debug_flag] = true
+      expecting = [
+        "FRICTIONLESS_TRACE='true'",
+        "export FRICTIONLESS_TRACE",
+        "cd /tmp && curl --tlsv1 -O -k https://testmaster:8140/packages/current/install.bash && bash install.bash --puppet-service-debug"
+      ].join("; ")
+
+      expect( subject.frictionless_agent_installer_cmd( host, {}, '2016.4.0' ) ).to eq(expecting)
+    end
+
   end
 
   describe 'install_ca_cert_on' do
@@ -1379,6 +1391,7 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
     it 'can perform a simple installation' do
+      allow( subject ).to receive( :verify_network_resources).with(hosts, nil)
       allow( subject ).to receive( :on ).and_return( Beaker::Result.new( {}, '' ) )
       allow( subject ).to receive( :fetch_pe ).and_return( true )
       allow( subject ).to receive( :create_remote_file ).and_return( true )
@@ -1451,6 +1464,7 @@ describe ClassMixedWithDSLInstallUtils do
       }, 1)
       opts[:masterless] = true
 
+      allow( subject ).to receive( :verify_network_resources).with(hosts, nil)
       allow( subject ).to receive( :hosts ).and_return( hosts )
       allow( subject ).to receive( :on ).and_return( Beaker::Result.new( {}, '' ) )
       allow( subject ).to receive( :fetch_pe ).and_return( true )
@@ -1484,6 +1498,7 @@ describe ClassMixedWithDSLInstallUtils do
       hosts[2][:pe_promoted_builds_url] = nil
       hosts[3][:pe_promoted_builds_url] = 'test-url'
 
+      allow( subject ).to receive( :verify_network_resources).with(hosts, nil)
       allow( subject ).to receive( :hosts ).and_return( hosts )
       allow( subject ).to receive( :options ).and_return(Beaker::Options::Presets.new.presets)
       allow( subject ).to receive( :on ).and_return( Beaker::Result.new( {}, '' ) )
@@ -1568,6 +1583,7 @@ describe ClassMixedWithDSLInstallUtils do
       hosts[2][:platform] = Beaker::Platform.new('el-6-x86_64')
       hosts[2][:pe_ver]   = '3.8'
 
+      allow( subject ).to receive( :verify_network_resources).with(hosts, nil)
       pa_version = 'rarified_air_1675'
       allow( subject ).to receive( :get_puppet_agent_version ).and_return( pa_version )
 
@@ -1638,6 +1654,7 @@ describe ClassMixedWithDSLInstallUtils do
         opts[:HOSTS][host.name] = host
       end
 
+      allow( subject ).to receive( :verify_network_resources).with(hosts, nil)
       pa_version = 'rarified_air_75699'
       allow( subject ).to receive( :get_puppet_agent_version ).and_return( pa_version )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.35.0
+  version: 1.36.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec