beaker-pe 1.17.0 → 1.18.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmJmODQ3NWQwNmU1YzgwOWYyMTEzZTA5NTA0NjM5YmZlMmNmYWVmNA==
+    MTNlZWVmZmY5NzA1ZGNjZWIzNTQwZWEwMzljZTQ3ZWRhZTA5NDlmMg==
   data.tar.gz: !binary |-
-    MWZhMGY3Y2YxMzhhNTYwZGRhNjk3MTkzYWFhNzcxMDYzOGM0MzEyMg==
+    MmQyNWMyNDExYzljYTU0M2FmZmY4NzY0ODUzMzQzZjA2N2RlN2UxMA==
 SHA512:
   metadata.gz: !binary |-
-    NDk4ZjM1MGY3NGE1NDAxMjZjOWNiNDAxNmIzYzNkNWEwNzhhNzY2MDdkNWM2
-    ZDJkMjczOTczZjAzNTg1YzdmODRhZGZlMmYyNmMyMGVhOTE4OWI4Y2RhNWI5
-    NmMyMWY0NWY4NDY2Y2E4NmU5YmI5MGRkZmY5ZjVkMTQ2NzY3YTE=
+    Yjc4ZjQyNGM3NTJhZDhkNzJjYzY2MGJjNDYwNTkxYjFkZjAyMTVjM2ZjNmU3
+    OWMzZDZhMjk5YWQ4YTNjZjJlNzMxYWY5ZDljYTllNWQ0MjJhYjc1ZDZhZjVj
+    YzIxYjlkMjg3MDJlNDQ4NTY0YTk3MmJjMDNhYThiY2VlMzcyMjU=
   data.tar.gz: !binary |-
-    MjBiNWIwNWQ0Y2Q0M2I4YjkzNDYzNWUyYTU2ZTU0NzEwNmRmOTljZTM2MWYx
-    NjJlZmZmZjI5MzY4YTYwNThjYzI0Y2ZkZWU5OWI4ZDk5MzI2NTVmMzdlNDUw
-    YTFhNzUxZTBlN2QxODU0NDkxNWRiYmY0ZmE1ZTZhMmI2ZmViOGU=
+    OWU2NjA1MWY2ZThhYTUxZmJkNzkxMWFjZTY3ZmIzNzFjZGZlNzM3Y2QxODY0
+    NmQ1MmJmNDliMzZjOTg1OTdkMGE3YTBjZjkyOTMzYTkxYzNiMWE4ZjVlZjcw
+    OThiZDBjZDRlYmRiZDBlOWVlN2JiMzgyMTA2ZTA3MThmZmUzYTY=

data/HISTORY.md

@@ -1,6 +1,6 @@
 # worker - History
 ## Tags
-* [LATEST - 7 Jun, 2017 (544c8585)](#LATEST)
+* [LATEST - 27 Jun, 2017 (25db20df)](#LATEST)
 * [1.16.0 - 26 May, 2017 (f8218db6)](#1.16.0)
 * [1.15.0 - 11 May, 2017 (0fddaad5)](#1.15.0)
 * [1.14.0 - 10 May, 2017 (874a7998)](#1.14.0)
@@ -40,7 +40,36 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 7 Jun, 2017 (544c8585)
+### <a name = "LATEST">LATEST - 27 Jun, 2017 (25db20df)
+
+* (GEM) update beaker-pe version to 1.18.0 (25db20df)
+
+* Merge pull request #75 from ericwilliamson/task/master/QENG-5095-frictionless-agent-use-current (d0924c94)
+
+
+```
+Merge pull request #75 from ericwilliamson/task/master/QENG-5095-frictionless-agent-use-current
+
+(QENG-5095) Use `current` endpoint for frictionless agent
+```
+* (QENG-5095) Use `current` endpoint for frictionless agent (416efbf5)
+
+
+```
+(QENG-5095) Use `current` endpoint for frictionless agent
+
+Previous to this commit, the url constructed for frictionless agent
+installs attempted to use the hosts `pe_ver` variable for getting the
+exact URL of the simplified install script. This was causing issues with
+PEZ builds due to the different pe_ver in the filename (for downloading
+the tarball) and the actual pe version.
+This commit updates the url to just use the `current` endpoint instead
+of the version, which mimics our install documentation. This won't
+really remove the ability of installing an older version via this method
+considering the logic for adding pe_repo classes didn't support passing
+a specific pe_ver / agent version to pe_repo.
+```
+* (HISTORY) update beaker-pe history for gem release 1.17.0 (38b5acd9)
 
 * (GEM) update beaker-pe version to 1.17.0 (544c8585)
 

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

@@ -113,10 +113,10 @@ module Beaker
               "powershell -c \"cd #{host['working_dir']};[Net.ServicePointManager]::ServerCertificateValidationCallback = {\\$true};\\$webClient = New-Object System.Net.WebClient;\\$webClient.DownloadFile('https://#{master}:8140/packages/#{version}/install.ps1', '#{host['working_dir']}/install.ps1');#{host['working_dir']}/install.ps1 -verbose #{frictionless_install_opts.join(' ')}\""
             elsif host['platform'] =~ /aix/ then
               curl_opts = '--tlsv1 -O'
-              "cd #{host['working_dir']} && curl #{curl_opts} https://#{master}:8140/packages/#{version}/install.bash && bash#{pe_debug} install.bash #{frictionless_install_opts.join(' ')}".strip
+              "cd #{host['working_dir']} && curl #{curl_opts} https://#{master}:8140/packages/current/install.bash && bash#{pe_debug} install.bash #{frictionless_install_opts.join(' ')}".strip
             else
               curl_opts = '--tlsv1 -kO'
-              "cd #{host['working_dir']} && curl #{curl_opts} https://#{master}:8140/packages/#{version}/install.bash && bash#{pe_debug} install.bash #{frictionless_install_opts.join(' ')}".strip
+              "cd #{host['working_dir']} && curl #{curl_opts} https://#{master}:8140/packages/current/install.bash && bash#{pe_debug} install.bash #{frictionless_install_opts.join(' ')}".strip
             end
           elsif host['platform'] =~ /osx/
             version = host['pe_ver'] || opts[:pe_ver]

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.17.0'
+        STRING = '1.18.0'
       end
 
     end

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

@@ -203,7 +203,7 @@ describe ClassMixedWithDSLInstallUtils do
       the_host['pe_ver'] = '3.8.0'
       the_host['pe_installer'] = 'puppet-enterprise-installer'
       the_host['roles'] = ['frictionless']
-      expect( subject.installer_cmd( the_host, {} ) ).to be ===  "cd /tmp && curl --tlsv1 -kO https://testmaster:8140/packages/3.8.0/install.bash && bash install.bash"
+      expect( subject.installer_cmd( the_host, {} ) ).to be ===  "cd /tmp && curl --tlsv1 -kO https://testmaster:8140/packages/current/install.bash && bash install.bash"
     end
 
     it 'generates a unix PE frictionless install command for a unix host with role "frictionless" and "frictionless_options"' do
@@ -213,7 +213,7 @@ describe ClassMixedWithDSLInstallUtils do
       the_host['pe_installer'] = 'puppet-enterprise-installer'
       the_host['roles'] = ['frictionless']
       the_host['frictionless_options'] = { 'main' => { 'dns_alt_names' => 'puppet' } }
-      expect( subject.installer_cmd( the_host, {} ) ).to be ===  "cd /tmp && curl --tlsv1 -kO https://testmaster:8140/packages/3.8.0/install.bash && bash install.bash main:dns_alt_names=puppet"
+      expect( subject.installer_cmd( the_host, {} ) ).to be ===  "cd /tmp && curl --tlsv1 -kO https://testmaster:8140/packages/current/install.bash && bash install.bash main:dns_alt_names=puppet"
     end
 
     it 'generates a osx PE install command for a osx host' do
@@ -250,7 +250,7 @@ describe ClassMixedWithDSLInstallUtils do
       the_host['pe_installer'] = 'puppet-enterprise-installer'
       the_host['roles'] = ['frictionless']
       the_host[:pe_debug] = true
-      expect( subject.installer_cmd( the_host, {} ) ).to be === "cd /tmp && curl --tlsv1 -kO https://testmaster:8140/packages/3.8.0/install.bash && bash -x install.bash"
+      expect( subject.installer_cmd( the_host, {} ) ).to be === "cd /tmp && curl --tlsv1 -kO https://testmaster:8140/packages/current/install.bash && bash -x install.bash"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec