beaker-pe 0.6.0 → 0.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTEwNTk1YmQyODUyN2JkYzVmYzAzN2U2OGE5NDUwMWY4ZWIwODc4MQ==
+    Mzg4ZWI5NTMwZmY5OGM5MTAxMjIzOGQxMTgxMzM2MmQzZDk5ODBlNQ==
   data.tar.gz: !binary |-
-    NGZmNjljOThhNGU1MjAwZDk0MGZmYzZkZWE1YzBkNjFlZmNmMTBmMA==
+    OGM3NjNlM2I2NjJhNmY4NDQ0YjI1ODEzNWQ0ODI4MGZmZmM2ODQzMA==
 SHA512:
   metadata.gz: !binary |-
-    MDI1Y2FlNjQyOThhZjNmNDVjNjQxZjg4MDJmMmRkOTc0MjZmNjgxOWU0MTQ4
-    MTk2YzQ5ZThlNDNjMGM5MjMwMzA2NWJlYmY3MjVlNTE0NGIwYzBjMzE4MzEy
-    ZWUwODBiODk3NTVjYzJiZDEwNDQ1ZjZmYTk3NjBlY2EzNTk3OWQ=
+    Y2ExZWVmMzZiZmQ5Yzg3NGZlNzI3MmRmZjY1MDY4NDMyOWRmNDIyNWIxMWVi
+    ODQzZGFiNGMwMTI3M2Y0ZmEyNDg5MTEyNDQwOGZjZDFjYjBmMzg0OWM2ODI3
+    YjYzZGMyNmNhYjkwNzkyODQzOGU4ZDhkYTg2MDRmYzliOGYyOTc=
   data.tar.gz: !binary |-
-    YzJiNDQwZTY5YTdkMmZmYTU5MTg3MWI5NGJhZjZhNGE0MzJkOGMwZTUxYjk0
-    MWQ3MzY0NmQ4MzYyMDc4OTFkYTk2YjlhZDIwYjk4Yjc1MzZhYWYzNjUwNWY1
-    MWRhZTFhM2ExNjVlMzJmNmIyMDc0NTMwMmI2YTg0OTQwMzdhYzI=
+    NWM5N2I5ZmNhMWI3MmVmYWRlNWE4ZDkxYzNiYTFjMWI1NTRjMWEzMmM5ZTc4
+    ZTExYjE0NmNlN2YwMmE2ZjQxNjA4NjAyMjMwMzYzZTgwODE4MTljZWZiNGUz
+    MmJhNDE5ZmJlNTViZjkzYTgzZDQwYjRiYzZhM2E2NWE3MGZlMGY=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 11 Jul, 2016 (48b663eb)](#LATEST)
+* [LATEST - 19 Jul, 2016 (f31dbe09)](#LATEST)
+* [0.6.0 - 11 Jul, 2016 (e974e7f8)](#0.6.0)
 * [0.5.0 - 15 Jun, 2016 (8f2874fe)](#0.5.0)
 * [0.4.0 - 1 Jun, 2016 (f5ad1884)](#0.4.0)
 * [0.3.0 - 26 May, 2016 (0d6b6d4c)](#0.3.0)
@@ -10,7 +11,66 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 11 Jul, 2016 (48b663eb)
+### <a name = "LATEST">LATEST - 19 Jul, 2016 (f31dbe09)
+
+* (GEM) update beaker-pe version to 0.7.0 (f31dbe09)
+
+* Merge pull request #12 from highb/feature/pe-15351_non_interactive_flag_on_installer (5062ede4)
+
+
+```
+Merge pull request #12 from highb/feature/pe-15351_non_interactive_flag_on_installer
+
+(PE-15351) Use -y option for 2016.2.1+ installs
+```
+* (PE-15351) Change -f option to -y (d86f4cde)
+
+
+```
+(PE-15351) Change -f option to -y
+
+Prior to this commit I was using the `-f` option in the installer,
+now it is `-y`. For more information, see
+https://github.com/puppetlabs/pe-installer-shim/pull/31/commits/0dfd6eb488456a7177673bb720edf9758521f096
+```
+* (PE-15351) Fix use of -c/-f flags on upgrades (33cdfef0)
+
+
+```
+(PE-15351) Fix use of -c/-f flags on upgrades
+
+Prior to this commit the condition used to decide whether to use
+the `-c`/`-f` flags was dependent on `host['pe_upgrade_ver']` and
+`host['pe_ver']` which was an unreliable condition.
+This commit updates the condition to determine whether to use the
+`-f` flag to simply look at `host['pe_ver']` because that value
+is updated depending on what version of pe is currently being
+installed or upgraded to.
+The condition to decide to omit the `-c` flag has to depend on
+`opts[:HOSTS][host.name][:pe_ver]` because that value is not
+modified during upgrade and can be used for a valid comparison
+to determine if the install will have a `pe.conf` file to use
+for an upgrade.
+```
+* (PE-15351) Use -f option for 2016.2.1+ installs (9372dc29)
+
+
+```
+(PE-15351) Use -f option for 2016.2.1+ installs
+
+Prior to this commit there was not an option for signalling a
+non-interactive install to the installer.
+This commit adds the new `-f` option added in
+https://github.com/puppetlabs/pe-installer-shim/pull/31 to the
+command line options for installation/upgrade.
+
+Additionally, this commit will remove the `-c` parameter being
+passed on upgrades from a 2016.2.0+ install, because the installer
+should be able to pick up on the existing pe.conf file.
+```
+### <a name = "0.6.0">0.6.0 - 11 Jul, 2016 (e974e7f8)
+
+* (HISTORY) update beaker-pe history for gem release 0.6.0 (e974e7f8)
 
 * (GEM) update beaker-pe version to 0.6.0 (48b663eb)
 

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

@@ -109,7 +109,19 @@ module Beaker
             host.install_from_file("puppet-enterprise-#{version}-#{host['platform']}.swix")
           else
             pe_debug = host[:pe_debug] || opts[:pe_debug]  ? ' -D' : ''
-            "cd #{host['working_dir']}/#{host['dist']} && ./#{host['pe_installer']}#{pe_debug} #{host['pe_installer_conf_setting']}"
+            pe_cmd = "cd #{host['working_dir']}/#{host['dist']} && ./#{host['pe_installer']}#{pe_debug}"
+            if ! version_is_less(host['pe_ver'], '2016.2.1')
+              # -y option sets "assume yes" mode where yes or whatever default will be assumed
+              pe_cmd += " -y"
+            end
+
+            # If there are no answer overrides, and we are doing an upgrade from 2016.2.0,
+            # we can assume there will be a valid pe.conf in /etc that we can re-use.
+            if opts[:answers].nil? && opts[:custom_answers].nil? && opts[:type] == :upgrade && !version_is_less(opts[:HOSTS][host.name][:pe_ver], '2016.2.0')
+              "#{pe_cmd}"
+            else
+              "#{pe_cmd} #{host['pe_installer_conf_setting']}"
+            end
           end
         end
 

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '0.6.0'
+        STRING = '0.7.0'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec