beaker-pe 1.36.0 → 1.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a17dc91d56e07d14fd5547212a846aa002361d91
-  data.tar.gz: a9b79e20ba95a43f3250a654389d9ff28f15ce3b
+  metadata.gz: 87e34e4ec7fa04f50f10ba94ced6ba07747fe830
+  data.tar.gz: 575b16a5a7f5e89286308d84fdb6401b06e786f6
 SHA512:
-  metadata.gz: 53bb7ca46de519fd5b8c96649e58a04f44befc203eaa63d187f29e585d312543b7f9b729005f08e8331f9b996f639dafac842eaf42485c0386b656a6bde0be8d
-  data.tar.gz: 65316498104bb3e13ef92afbb44b33dc017fa2df9b0405e14f876fc3121809d9bf45d9457ebc0e40a9bbe8adb8eaa3fa9faa89941427f0bf4c81072956b3672f
+  metadata.gz: 15a4439aa82bb097e1fe5b7842604947e23e247a21e7c3dd62d4af8789afd5020f68c7b552f3c28008eeedca280c252de1f3fc2dd4ef15c31de141de9d3aaf8a
+  data.tar.gz: 80110427e1ca5bf345849d4339ab67ffe7a804878d52e3290110114ae179df43579b92f9d6bbc64dacadcfd1f40d9aea75f50b804636ddd396b8d2dc7e5cd278

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

@@ -148,10 +148,10 @@ module Beaker
             end
           end
 
-          # pe_repo also supports flags that will determine what happens during the frictionless install
+          # PE 2018.1.0 introduced a pe_repo flag 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
+          if (host[:puppet_service_debug_flag] == true and ! version_is_less(pe_version, '2018.1.0'))
             frictionless_install_opts << '--puppet-service-debug'
           end
 

data/lib/beaker-pe/version.rb

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

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

@@ -315,17 +315,27 @@ 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
+    it 'generates a unix PE frictionless install command without the puppet service debug flag if installing on an older version of PE' 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"
+        "cd /tmp && curl --tlsv1 -O -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)
     end
 
+    it 'generates a unix PE frictionless install command with the puppet service debug flag if installing 2018.1.0' 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, {}, '2018.1.0' ) ).to eq(expecting)
+    end
   end
 
   describe 'install_ca_cert_on' do

metadata

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