beaker-pe 1.1.0 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2MxN2YxODgwZTUxYjExMTljZGJlYzY4ZmU0MjgzNjM2NTQ1MzM3Yw==
+    YzQyMzM2ZjYxMWQxOGQwNjk4MDI3MmQ3ZWE5MTk2N2U2ODE0ZDljYQ==
   data.tar.gz: !binary |-
-    OGQ5YTEyNGU2YTUyZjZjMWQwYTBhZmRiZmNmMmU3ZDdiMGM4MWVjZA==
+    N2E2OGVlZmY5MjRjZTE2NmEwMTU5MDYyZThmMTEyM2E5ZDcwYmE5Ng==
 SHA512:
   metadata.gz: !binary |-
-    YzVlM2Y1MDZlYzhjNDc5ZjAyZGI1N2I2NjE4NTdkOTk1YWYyMTU3NDg4YjQx
-    ODk3OGU2ZTNlMTZjYWM3ZTJhNmQxMDY1MmJhYWQwNzI1MGQ1NDkyZTBmMjA0
-    MjcwMTQ4MGE4MGZlYjE4M2UxNmU0YTUxZGI1NDFiZGM2MDdjYjY=
+    ODJlZWViYWFkYWE1NGY3ZjE2OGJlYjU1ZGU1ZWJkODMwMTk2M2Y3MjBkOTc2
+    YmFlYzRjYTc5NGM5Y2NiYTAwNWFhZGM4MWU1ZjkzMDBlMDE3MGZmN2UxYmJj
+    NGVkMmJkZmEwYWE1NjhjNmQ1ZGFkYmJlNzJhZDljN2E2YWRmYzI=
   data.tar.gz: !binary |-
-    MTRlYjU2ZjljZjFhZGY3NjUyN2M2ZGU5M2E5ODY1ZjRjMDM0N2M1MjcyMjRk
-    ZTE4NWM2ZGY4Y2E4ODRmYTQ2MTFiMzg5MTFkZTBjOTYzNTQwYTlhMmU1YmFi
-    ZjNiNjRlYTcxZmE4ZGE0OTgxNGY5OTc3ZTc1MzBhYTFlODY5OTQ=
+    MmIzOTYxYzY0ZGY5MzgyYTlkMzc3NjJiMjhiMjljNzY2ZDVmOGRiMWM0MmFl
+    ZWFkMWVjOWY2MGM0YTdhNDU2OWFhMTBhOTJmYWY3OGU3NWM1OTVjNGY4N2Y2
+    NTRlMjlkYTlkNGM5Yjc2NDQwYWRmMmRiMGQ4NjE5MGJiOGZkNTQ=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 29 Sep, 2016 (e4576973)](#LATEST)
+* [LATEST - 4 Oct, 2016 (bab690e0)](#LATEST)
+* [1.1.0 - 29 Sep, 2016 (5b9f2600)](#1.1.0)
 * [1.0.0 - 26 Sep, 2016 (84a5b56b)](#1.0.0)
 * [0.12.0 - 16 Sep, 2016 (81e5a0b0)](#0.12.0)
 * [0.11.0 - 25 Aug, 2016 (7167f39e)](#0.11.0)
@@ -19,7 +20,25 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 29 Sep, 2016 (e4576973)
+### <a name = "LATEST">LATEST - 4 Oct, 2016 (bab690e0)
+
+* (GEM) update beaker-pe version to 1.2.0 (bab690e0)
+
+* (PE-17359) Adding Windows frictionless agent support (#28) (f4b72e18)
+
+
+```
+(PE-17359) Adding Windows frictionless agent support (#28)
+
+This commit adds support for windows frictionless agent.
+There was a change to the pe_repo logic, to make sure the master
+downloads the new windows script.
+Also there is the addition of a powershell script, which is the
+direct equivlant of curl | bash.
+```
+### <a name = "1.1.0">1.1.0 - 29 Sep, 2016 (5b9f2600)
+
+* (HISTORY) update beaker-pe history for gem release 1.1.0 (5b9f2600)
 
 * (GEM) update beaker-pe version to 1.1.0 (e4576973)
 

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

@@ -96,12 +96,15 @@ module Beaker
             end
 
             pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -x' : ''
-            if host['platform'] =~ /aix/ then
+            if host['platform'] =~ /windows/ then
+              "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
             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
             end
-            "cd #{host['working_dir']} && curl #{curl_opts} https://#{master}:8140/packages/#{version}/install.bash && bash#{pe_debug} install.bash #{frictionless_install_opts.join(' ')}".strip
           elsif host['platform'] =~ /osx/
             version = host['pe_ver'] || opts[:pe_ver]
             pe_debug = host[:pe_debug] || opts[:pe_debug] ? ' -verboseR' : ''
@@ -283,7 +286,15 @@ module Beaker
         # @api private
         def deploy_frictionless_to_master(host)
           klass = host['platform'].gsub(/-/, '_').gsub(/\./,'')
-          klass = "pe_repo::platform::#{klass}"
+          if host['platform'] =~ /windows/
+            if host['template'] =~ /i386/
+              klass = "pe_repo::platform::windows_i386"
+            else
+              klass = "pe_repo::platform::windows_x86_64"
+            end
+          else
+            klass = "pe_repo::platform::#{klass}"
+          end
           if version_is_less(host['pe_ver'], '3.8')
             # use the old rake tasks
             on dashboard, "cd /opt/puppet/share/puppet-dashboard && /opt/puppet/bin/bundle exec /opt/puppet/bin/rake nodeclass:add[#{klass},skip]"
@@ -414,7 +425,10 @@ module Beaker
           end
 
           install_hosts.each do |host|
-            if agent_only_check_needed && hosts_agent_only.include?(host)
+            #windows agents from 4.0 -> 2016.1.2 were only installable via aio method
+            is_windows_msi_and_aio = (host['platform'] =~ /windows/ && (version_is_less(host['pe_ver'], '2016.3.0') && !version_is_less(host['pe_ver'], '3.99') && !(host['roles'].include?('frictionless'))))
+
+            if agent_only_check_needed && hosts_agent_only.include?(host) || is_windows_msi_and_aio
               host['type'] = 'aio'
               install_puppet_agent_pe_promoted_repo_on(host, { :puppet_agent_version => host[:puppet_agent_version] || opts[:puppet_agent_version],
                                                                :puppet_agent_sha => host[:puppet_agent_sha] || opts[:puppet_agent_sha],
@@ -424,7 +438,8 @@ module Beaker
               acceptable_exit_codes = [0, 1]
               acceptable_exit_codes << 2 if opts[:type] == :upgrade
               setup_defaults_and_config_helper_on(host, master, acceptable_exit_codes)
-            elsif host['platform'] =~ /windows/
+            #Windows allows frictionless installs starting with PE Davis, if frictionless we need to skip this step
+            elsif (host['platform'] =~ /windows/ && !(host['roles'].include?('frictionless')))
               opts = { :debug => host[:pe_debug] || opts[:pe_debug] }
               msi_path = "#{host['working_dir']}\\#{host['dist']}.msi"
               install_msi_on(host, msi_path, {}, opts)
@@ -460,7 +475,6 @@ module Beaker
                 configure_type_defaults_on(host)
               end
             end
-
             # On each agent, we ensure the certificate is signed
             if !masterless
               if [master, database, dashboard].include?(host) && use_meep?(host['pe_ver'])
@@ -498,6 +512,11 @@ module Beaker
                 if host == dashboard
                   check_console_status_endpoint(host)
                 end
+                #Workaround for windows frictionless install, see BKR-943 for the reason
+                if (host['platform'] =~ /windows/) and (host['roles'].include? 'frictionless')
+                  client_datadir = host.puppet['client_datadir']
+                  on(host , puppet("resource file \"#{client_datadir}\" ensure=absent force=true"))
+                end
               end
             end
 

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.1.0'
+        STRING = '1.2.0'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec