beaker 2.18.0 → 2.18.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmM2NTk1MjNkOGFiMGQ2ZDM3MGYxZjcxNDcxNzU1MTliMTAyOWMxMQ==
+    MDk4YmZiMzQwNWUxOTczZGZjMmYwYTBhNzQ1NWQyODc3NDlhZGYzMg==
   data.tar.gz: !binary |-
-    OTlhMDZiNzc1MTAxODg4ODk4OGEzMzA1MmMzZDA0Mzc5NmRlYmRjNA==
+    ZmU3YjQ2ZjhmNjM3ODBjZjIwYTI3YTQ2ODRjY2U1ZTgyNjlmNTY3ZA==
 SHA512:
   metadata.gz: !binary |-
-    OTZhYzg1Njk2NGJkZGM1NDY5MDAwYTQ5Njg1ZTQ4YzFlNWZlYjdiYWY0NWZm
-    ODRhMjM1NGQxOWFjMmZmMzdiMmQwYzUyMWY4YTlmNGRmYzdlNDM5YTI5OGIw
-    N2Q5ZGNlNzJiNTAzM2EzYjc3NWQzNTU1ZWZmOWY1ZDIyMjM0Y2Y=
+    MzYzNzNjNTIxMTkzNTI3ZGQxZDQ3ODBjZjc4ZmQwNGNiOTdhYjE0NzlkYjk1
+    YTdjZjk3NDRiMGU3MWQzZGIxMjg2MmFhNjcwZDQ0ZjBlYWZhOTk5OTJkN2Vk
+    ODEzNmUxZTZlYjNmNTI2MzZmYzY0ZDNjZGQ1ZjBjMWE1NjJmMzY=
   data.tar.gz: !binary |-
-    YzFjMTMyMWI0NWU5ZmIzMmE1NTA5YTRiZjVkNzcwMGRjOWFiMDNiNTZhZDZh
-    YmEzZWJiNmMyMmY4MTllZTZhOTBlMjk3M2Q5ZmFiNWU4MzcwZWE0N2EwMTll
-    NDA1Y2NkYTliYTE2NDczNWJjODE0ZTM0MTdmMmExNjk3NWM0NTE=
+    OGEwNDc5MjlhMDIzMGJhMThjZDk4ZTI4NmI3MTE5NDk5ZjU0ODE2ODg1OTFk
+    YTE1ODVkNTkzMWQ2OGU5OWI4M2E4MDhlNzA2ZDc2Mzc1MGI3YTc2MGNkMmU1
+    YWEyNjBiZDA3ZmY0OTI3MzAyOWFkN2IyOTNhMDk4ZGI3ZDVjN2U=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 13 Jul, 2015 (268ce21e)](#LATEST)
+* [LATEST - 14 Jul, 2015 (f9939536)](#LATEST)
+* [2.18.0 - 13 Jul, 2015 (e018f2fc)](#2.18.0)
 * [2.17.0 - 10 Jul, 2015 (aaac4771)](#2.17.0)
 * [2.16.0 - 6 Jul, 2015 (b3e76227)](#2.16.0)
 * [2.15.1 - 1 Jul, 2015 (cd6f0bab)](#2.15.1)
@@ -87,7 +88,53 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 13 Jul, 2015 (268ce21e)
+### <a name = "LATEST">LATEST - 14 Jul, 2015 (f9939536)
+
+* (GEM) update beaker version to 2.18.1 (f9939536)
+
+* Merge pull request #891 from anodelman/shallow (c4b30018)
+
+
+```
+Merge pull request #891 from anodelman/shallow
+
+(BKR-402) Regression in Beaker 2.18.0 AIO testing for PuppetDB usage
+```
+* Merge pull request #890 from justinstoller/bug/master/BKR-403_sless (e52b0af4)
+
+
+```
+Merge pull request #890 from justinstoller/bug/master/BKR-403_sless
+
+(BKR-403) Use rpm on sles for pe puppet-agent
+```
+* (BKR-402) Regression in Beaker 2.18.0 AIO testing for PuppetDB usage (8c262979)
+
+
+```
+(BKR-402) Regression in Beaker 2.18.0 AIO testing for PuppetDB usage
+
+- provide a sane default for puppetservice for aio defaults, but allow
+  override with a user setting
+```
+* (BKR-403) Use rpm on sles for pe puppet-agent (6acd9938)
+
+
+```
+(BKR-403) Use rpm on sles for pe puppet-agent
+
+In BKR-397 we updated rpm using platforms to use yum instead of rpm in
+the install_puppet_agent_pe_promoted_repo, however it wasn't noticed
+that SLES was also an rpm using platform in the match that doesn't also
+include yum.
+
+This patch moves SLES platforms into their own branch of logic that uses
+the old rpm installation method while retaining the yum based
+installation for other platforms.
+```
+### <a name = "2.18.0">2.18.0 - 13 Jul, 2015 (e018f2fc)
+
+* (HISTORY) update beaker history for gem release 2.18.0 (e018f2fc)
 
 * (GEM) update beaker version to 2.18.0 (268ce21e)
 

data/lib/beaker/dsl/install_utils/aio_defaults.rb

@@ -10,7 +10,6 @@ module Beaker
         #
         AIO_DEFAULTS = {
           'unix' => {
-            'puppetservice'         => 'pe-puppetserver',
             'puppetbindir'          => '/opt/puppetlabs/bin',
             'privatebindir'         => '/opt/puppetlabs/puppet/bin',
             'distmoduledir'         => '/etc/puppetlabs/code/modules',

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -39,6 +39,8 @@ module Beaker
               or (host['type'] && host['type'] =~ /aio/)
               # add aio defaults to host
               add_aio_defaults_on(host)
+              # provide a sane default here for puppetservice
+              host['puppetservice'] ||= 'puppetserver'
             else
               add_foss_defaults_on(host)
             end
@@ -1141,9 +1143,12 @@ module Beaker
             scp_to host, File.join(copy_dir_local, download_file), onhost_copy_base
 
             case variant
-            when /^(fedora|el|centos|sles)$/
+            when /^(fedora|el|centos)$/
               on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
               on host, "yum --nogpgcheck localinstall -y #{onhost_copied_file}"
+            when /^(sles)$/
+              on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
+              on host, "rpm -ihv #{onhost_copied_file}"
             when /^(debian|ubuntu|cumulus)$/
               on host, "tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}"
               on host, "dpkg -i --force-all #{onhost_copied_file}"

data/lib/beaker/dsl/install_utils/pe_defaults.rb

@@ -11,7 +11,7 @@ module Beaker
         PE_DEFAULTS = {
           'mac' => {
             'puppetserver-confdir' => '/etc/puppetlabs/puppetserver/conf.d',
-            'puppetservice'    => 'pe-httpd',
+            'puppetservice'    => 'pe-puppetserver',
             'puppetpath'       => '/etc/puppetlabs/puppet',
             'puppetconfdir'    => '/etc/puppetlabs/puppet',
             'puppetcodedir'    => '/etc/puppetlabs/puppet',
@@ -26,7 +26,7 @@ module Beaker
           },
           'unix' => {
             'puppetserver-confdir' => '/etc/puppetlabs/puppetserver/conf.d',
-            'puppetservice'    => 'pe-httpd',
+            'puppetservice'    => 'pe-puppetserver',
             'puppetpath'       => '/etc/puppetlabs/puppet',
             'puppetconfdir'    => '/etc/puppetlabs/puppet',
             'puppetbin'        => '/opt/puppet/bin/puppet',
@@ -40,7 +40,7 @@ module Beaker
             'sitemoduledir'    => '/opt/puppet/share/puppet/modules',
           },
           'windows' => { #cygwin windows
-            'puppetservice' => 'pe-httpd',
+            'puppetservice' => 'pe-puppetserver',
             'puppetpath'    => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
             'puppetconfdir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
             'puppetcodedir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
@@ -53,7 +53,7 @@ module Beaker
             'privatebindir' => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet Enterprise/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet Enterprise/sys/ruby/bin',
           },
           'pswindows' => { #windows windows
-            'puppetservice' => 'pe-httpd',
+            'puppetservice' => 'pe-puppetserver',
             'puppetpath'    => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
             'puppetconfdir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
             'puppetcodedir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
@@ -79,10 +79,10 @@ module Beaker
             host['group'] = 'pe-puppet'
           end
           host['type'] = 'pe'
-          # newer pe requires a different puppetservice name, set it here on the master
+          # older pe requires a different puppetservice name, set it here on the master
           if host['roles'].include?('master')
-            if host['pe_ver'] and (not version_is_less(host['pe_ver'], '3.4'))
-              host['puppetservice'] = 'pe-puppetserver'
+            if host['pe_ver'] and (version_is_less(host['pe_ver'], '3.4'))
+              host['puppetservice'] = 'pe-httpd'
             end
           end
         end

data/lib/beaker/dsl/install_utils/pe_utils.rb

@@ -28,6 +28,8 @@ module Beaker
           block_on hosts do |host|
             if host[:pe_ver] && aio_version?(host) or (host['type'] && host['type'] =~ /aio/)
               add_aio_defaults_on(host)
+              # provide a sane default here for puppetservice
+              host['puppetservice'] ||= 'pe-puppetserver'
             else
               add_pe_defaults_on(host)
             end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.18.0'
+    STRING = '2.18.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.18.1
 platform: ruby
 authors:
 - Puppetlabs