beaker-pe 1.7.0 → 1.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWU4ZTk5NzEzNTQyM2YzNDAzZjY0YWMxMmQwMjA4MDE3MTkwM2JhNg==
+    MzU2YTU0MGFkMGFiZjliMGU4MTQ2NGM5NThkNDBiZTM5NGJhMmIyOQ==
   data.tar.gz: !binary |-
-    Y2RiZDllMDhiY2Q4ZDhlMzUzNDU3ZTg1MjU1MjlhYzg3ZmFiODdmNg==
+    NzFhYjVmY2NhMjZjMDY3ODM5NDhhMDgxYjU2ZmE4N2YyNmQyZGQwOQ==
 SHA512:
   metadata.gz: !binary |-
-    MTM1YjU2ODYwZGZmMDVlNGQ4MDhjMzcwNDU1Yzc3N2IxNTIzODFkZTQ4YzEy
-    OTBhZjI5NjIxY2ZmYjA0ODBiMTljZWViNDFhNGNhZDI4Y2RhMDQ4MmVlNTlm
-    MTcwZGQ1NmZmNTkyZjQ5ZTFkM2QyYTJkOWNjOTc4Y2NmNmMyZWM=
+    MjA2YWRkMTBhMDg4YjFlNWE2Y2JiYTk1YThhZWU2ZDJmODM1YmQwYmIzN2Mz
+    ZGEzNDZiNjhhYjcxNDliNzM0YWU2MDYxODZmM2RhNjJiM2FjZTViYjQ1ZjM1
+    MWVhZDYyYzdmMWNlZjg4ZmY1MzczMWVmNTliYTI2MzhjOTQ5ZWM=
   data.tar.gz: !binary |-
-    NmExZjQzNzA1OTMxMmMyZDJiZmExMTgwODMyMjBjMmIwZmE1YjI1M2U0YTBi
-    YzIxM2I2Mzc0N2RkZjhkYjk2OTdmMDU1OGViYmM0MzMzYTYzYTY2MjJhNzA4
-    ODFhYTgzYzAyNTdmMjE2MGVjNWEyN2FkZTY5ZjRiY2M3OTg2MzY=
+    MDNlZjMxZDQ3Yzk3ODU1ZDllMTE1MjFmM2M2ZTY2ODk3MmE1NDUyYTc1Y2U3
+    NmFmYTE0YTU5OWMxZjI4YTAyMDBlMjg3YTFjYzJlNzE2ZDcwZmNlZDBmMTI0
+    Y2VmN2RiMTJjMGI1MDRlZDNhOGZhMzY3NTI1ZTZhYjIyNjkwMTE=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 20 Dec, 2016 (80c18a2b)](#LATEST)
+* [LATEST - 30 Dec, 2016 (75d22036)](#LATEST)
+* [1.7.0 - 20 Dec, 2016 (99e6bbde)](#1.7.0)
 * [1.6.1 - 22 Nov, 2016 (52e30609)](#1.6.1)
 * [1.6.0 - 16 Nov, 2016 (0da1b64c)](#1.6.0)
 * [1.5.0 - 7 Nov, 2016 (24d78992)](#1.5.0)
@@ -26,7 +27,36 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 20 Dec, 2016 (80c18a2b)
+### <a name = "LATEST">LATEST - 30 Dec, 2016 (75d22036)
+
+* (GEM) update beaker-pe version to 1.8.0 (75d22036)
+
+* (PE-18728) Skip frictionless install if agent is affected by powershell 2 bug (#45) (48b3b788)
+
+
+```
+(PE-18728) Skip frictionless install if agent is affected by powershell 2 bug (#45)
+
+We introduced frictionless installs for Windows agents in PE 2016.4.0.
+For upgrade scenarios where we are testing frictionless upgrades, to
+install we need to use the old MSI method if we are installing less then
+PE 2016.4.0.
+However, we have discovered that frictionless installs of windows2008r2
+will fail on PE 2016.4.0 and PE 2016.4.2.
+This PR adds in logic to install with the non-frictionless method if the
+agent is windows2008r2 and version is less then PE 2016.4.3.
+```
+* (MAINT) add install PE doc (#41) (2e748b9c)
+
+
+```
+(MAINT) add install PE doc (#41)
+
+[skip ci]
+```
+### <a name = "1.7.0">1.7.0 - 20 Dec, 2016 (99e6bbde)
+
+* (HISTORY) update beaker-pe history for gem release 1.7.0 (99e6bbde)
 
 * (GEM) update beaker-pe version to 1.7.0 (80c18a2b)
 

data/README.md

@@ -17,6 +17,9 @@ that help someone acceptance test PE easier with Beaker.
 technical reference for APIs and other aspects of beaker-pe. They describe
 how it works and how to use it but assume that you have a basic understanding
 of key concepts.
+- [How-to guides](docs/how_to) are recipes. They guide you through the steps
+involved in addressing key problems and use-cases. For instance, checkout our
+[How-to Install Puppet Enterprise doc](docs/how_to/install_puppet_enterprise.md).
 
 # Upgrading from 0.y to 1.y?
 

data/docs/how_to/install_puppet_enterprise.md

@@ -0,0 +1,87 @@
+# How To Install Puppet Enterprise
+
+Welcome to the choose your own adventure of installing Puppet Enterprise (PE)!
+This doc will guide you through the process beaker's DSL helpers use to install
+PE for acceptance testing.
+
+Note that this is not a complete documentation of the process, but a general
+overview. There will be specific hiccups for particular platforms and special
+cases. These are not included at this point. The idea is that as we come upon
+them, we will now have a place to document those details, so that we can
+over time bring this to 100% completeness.
+
+# First Things First: What Do You Want to Install?
+
+PE comes in all varieties. Not only in any number of ever-growing versions, but
+in different install methods & locations as Puppet improves the install methods
+over time.
+
+The first questions to ask yourself are:
+
+1. Are you installing Puppet Agent, or other services?
+1. What version of PE are you installing from?
+
+If you're installing PE 2015.2 or newer and you're installing PE's Puppet Agent,
+then you're on track for our newest agent install strategy, installing from PE's
+promoted agents location. Check our next section for more information on that.
+
+If one (or both) of these conditions don't apply to you, then skip to the next
+section: All Other Installs.
+
+# PE Promoted Agent Installs
+
+Installing Puppet Agent from the PE promoted locations is handled in core beaker,
+not in beaker-pe itself. You can read more about doing this in
+[beaker's How To Install Puppet Doc](https://github.com/puppetlabs/beaker/tree/master/docs/how_to/install_puppet.md).
+
+### Higher-level Install Methods
+
+Below, there's a section on "General Installer Methods." The method in beaker's
+"How To Install Puppet" doc (link above) is the only one specifically for
+installing Puppet Agent from the PE promoted location, but the higher methods
+will call that one if certain conditions are met 
+([conditions doc](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Roles#aio_version%3F-instance_method)).
+
+# All Other Installs
+
+If you need any other services besides an agent, or you're installing from a
+version before 2015.2, you'll end up with our traditional tarball (compressed
+`*.tar.gz` file) installer. These installers are described in the next section.
+
+# Generic Installer Methods
+
+### [`install_pe_on`](http://www.rubydoc.info/github/puppetlabs/beaker-pe/Beaker/DSL/InstallUtils/PEUtils#install_pe_on-instance_method)
+
+This method is a wrapper on our install PE behavior that allows you to pass in
+which hosts in particular you'd like to call, as well as specifying the options
+used yourself.
+
+Note that there are a number of properties needed for installing
+PE and they haven't been all documented, so the general workaround is to pass
+the global options hash (the `options` TestCase accessor is best, you don't have
+to qualify or include anything to get the method, just use the method by name)
+as the `opts` parameter.
+
+Note that this method does the work to figure out `pe_ver` if you don't pass it
+in as an argument. As a last result, beaker-pe will try to put together a URL
+in this form from these beaker global settings:
+
+```ruby
+#{ pe_dir }/${ pe_version_file }
+```
+
+`pe_version_file` is set to `LATEST` by default. This is the file that will tell
+beaker which PE installer in the directory it should install. This file should
+be plain text, and just include the PE version number of the installer to use.
+To check further into how this code works, you'll have to read the code
+
+To see how the filename for the package itself is built, please checkout how the
+`host['dist']` property is built for a particular platform in
+[this code](https://github.com/puppetlabs/beaker-pe/blob/master/lib/beaker-pe/install/pe_utils.rb#L388-L421).
+
+### [`install_pe`](http://www.rubydoc.info/github/puppetlabs/beaker-pe/Beaker/DSL/InstallUtils/PEUtils#install_pe-instance_method)
+
+This method is our generic "install PE on all hosts" convenience method. As a
+matter of fact, it just calls `install_pe_on`, passing the entire `hosts` array
+and the global options hash as the `opts` parameter, just as we suggested in the
+`install_pe_on` documentation above. Please check those docs for more info.

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

@@ -397,10 +397,8 @@ module Beaker
           end
 
           install_hosts.each do |host|
-            #windows agents from 4.0 -> 2016.1.2 were only installable via the 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')))
 
-            if agent_only_check_needed && hosts_agent_only.include?(host) || is_windows_msi_and_aio
+            if agent_only_check_needed && hosts_agent_only.include?(host) || install_via_msi?(host)
               host['type'] = 'aio'
               install_puppet_agent_pe_promoted_repo_on(host, {
                 :puppet_agent_version => get_puppet_agent_version(host, opts),
@@ -413,7 +411,7 @@ module Beaker
               acceptable_exit_codes << 2 if opts[:type] == :upgrade
               setup_defaults_and_config_helper_on(host, master, acceptable_exit_codes)
             #Windows allows frictionless installs starting with PE Davis, if frictionless we need to skip this step
-            elsif (host['platform'] =~ /windows/ && !(host['roles'].include?('frictionless')))
+            elsif (host['platform'] =~ /windows/ && !(host['roles'].include?('frictionless')) || install_via_msi?(host))
               opts = { :debug => host[:pe_debug] || opts[:pe_debug] }
               msi_path = "#{host['working_dir']}\\#{host['dist']}.msi"
               install_msi_on(host, msi_path, {}, opts)
@@ -615,6 +613,15 @@ module Beaker
           !version_is_less(version, MEEP_CUTOVER_VERSION)
         end
 
+        # Check if windows host is able to frictionlessly install puppet
+        # @param [Beaker::Host] host that we are checking if it is possible to install frictionlessly to
+        # @return [Boolean] true if frictionless is supported and not affected by known bugs
+        def install_via_msi?(host)
+          #windows agents from 4.0 -> 2016.1.2 were only installable via the aio method
+          #powershell2 bug was fixed in PE 2016.4.3
+          (host['platform'] =~ /windows/ && (version_is_less(host['pe_ver'], '2016.4.0') && !version_is_less(host['pe_ver'], '3.99'))) || (host['platform'] =~ /windows-2008r2/ && (version_is_less(host['pe_ver'], '2016.4.3') && !version_is_less(host['pe_ver'], '3.99')))
+        end
+
         # On July 8th, 2016, the gpg key that was shipped and used to sign repos in
         # PE tarballs expired. This affects all PE version earlier then 3.8.5, and
         # versions between 2015.2 to 2016.1.2.

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.7.0'
+        STRING = '1.8.0'
       end
 
     end

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

@@ -251,6 +251,38 @@ describe ClassMixedWithDSLInstallUtils do
       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"
     end
+  end
+
+  describe 'install_via_msi?' do
+    it 'returns true if pe_version is before PE 2016.4.0' do
+      the_host = winhost.dup
+      the_host['roles'] = ['frictionless']
+      the_host['pe_ver'] = '2015.2.3'
+      expect(subject.install_via_msi?(the_host)).to eq(true)
+    end
+
+    it 'returns nil if pe_version is PE 2016.4.0 or newer' do
+      the_host = winhost.dup
+      the_host['roles'] = ['frictionless']
+      the_host['pe_ver'] = '2016.4.2'
+      expect(subject.install_via_msi?(the_host)).to be nil
+    end
+
+    it 'returns true if pe_version is 2016.4.0 and platform is windows-2008r2 bug' do
+      the_host = winhost.dup
+      the_host['roles'] = ['frictionless']
+      the_host['platform'] = 'windows-2008r2'
+      the_host['pe_ver'] = '2016.4.0'
+      expect(subject.install_via_msi?(the_host)).to eq(true)
+    end
+
+    it 'returns false if pe_version is 2016.4.3 and platform is windows-2008r2 bug' do
+      the_host = winhost.dup
+      the_host['roles'] = ['frictionless']
+      the_host['platform'] = 'windows-2008r2'
+      the_host['pe_ver'] = '2016.4.3'
+      expect(subject.install_via_msi?(the_host)).to eq(false)
+    end
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2016-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -188,6 +188,7 @@ files:
 - acceptance/tests/install_smoke_test.rb
 - beaker-pe.gemspec
 - bin/beaker-template
+- docs/how_to/install_puppet_enterprise.md
 - lib/beaker-pe.rb
 - lib/beaker-pe/install/pe_utils.rb
 - lib/beaker-pe/options/pe_version_scraper.rb