beaker 2.4.1 → 2.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzE2NjM0MmU0ZTNkNzk5ZDNlYWEyNzYyZjJlYmMzMDgyNTc5ZjM1MA==
+    MTAxY2VmNjc1ZjM2NDAyOWM3YjM1NWYxZGI5YTE0ZTk4YzhjYTczOQ==
   data.tar.gz: !binary |-
-    NDJiOGRjNjRmNWZjYjM4MTU3NWNiNDgwZTIwZWZiNjEzNTcyZDg1Ng==
+    YTY1MzczMWY5YmNjOTRjZDA3MDE0MjM1ZjdmMjBmMzM3MjdhODI2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    YTk5MGM2N2U3MTk5NGZmZjgwNmQyY2JiYjNhZWRiNWFkNTgxOTEwMDk0MGYz
-    NTRjZjNmZDg4ZTgyNGE1YzVjNmFjZjcyYzlhYmE2NGQ3OTliNGNhNWI1OWQ2
-    N2M3YjI2MWQ4NjdlMjRlNzY5MWQyMjI2MzY2YjZkYzNmZmQyMzQ=
+    YWQwZGE3YzVjZmRkZWZiODE5NTFmZTViMWViNGVlMTllMzFkYzMzMTdlYTM3
+    YWU4MTE2MDdiOTgzZDRmYTIxZjMyYjU2MDcxYjNmMjkyZDcyMTYyNGQwZDIx
+    YmVlYmRmNTQ5OTgxYWViOTgyZjM3NTQ5ZjJlMmUyYWQxYTE3ZjY=
   data.tar.gz: !binary |-
-    ODMyNTM2MjUzNjE5YTQ2MWNjMTRhNzM1YjdiYjUwYjhmYzc5ZWI4MGU3N2Ri
-    YTE0YjNjZWI1NDczYzBjMDVhYmY2MGYzOWVjM2U2MmU1ZDBkMTA3MjNiZTcy
-    Mzg3MzA1ZTQwYWM5ZjhmNDBhZTEwNTFmZWRmZGFmODAwZTgyYzA=
+    Zjk1NzdiNjg5N2Y2YjE3MGZhMzZkYTY5M2RiNWIyYWRjOTY5NTIzY2FjMjFl
+    YTNkYmYxMTM0MmVkYTEzYzgzYTZmZjA3OGEzZTIzMzA2YzJjODM1YTY5ZTY3
+    ZThkYTI3NTVkMzY4ZGVkNGYyYzNmNmUwNTA0OTkwZGQ0MDUwYzQ=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 13 Feb, 2015 (c3cffad8)](#LATEST)
+* [LATEST - 23 Feb, 2015 (9ad8bd4c)](#LATEST)
+* [beaker2.4.1 - 13 Feb, 2015 (84400ed1)](#beaker2.4.1)
 * [beaker2.4.0 - 13 Feb, 2015 (bc5a6676)](#beaker2.4.0)
 * [beaker2.3.0 - 29 Jan, 2015 (3d185da0)](#beaker2.3.0)
 * [beaker2.2.0 - 8 Jan, 2015 (cba5f7ed)](#beaker2.2.0)
@@ -70,7 +71,145 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 13 Feb, 2015 (c3cffad8)
+### <a name = "LATEST">LATEST - 23 Feb, 2015 (9ad8bd4c)
+
+* (GEM) update beaker version to 2.5.0 (9ad8bd4c)
+
+* Merge pull request #701 from anodelman/win-fix (de652599)
+
+
+```
+Merge pull request #701 from anodelman/win-fix
+
+(QENG-1852) install_puppet unable to install windows msi (regression)
+```
+* Merge pull request #677 from kevpl/qeng1721_aio_windowsadd (566600ba)
+
+
+```
+Merge pull request #677 from kevpl/qeng1721_aio_windowsadd
+
+qeng1721: added AIO windows support
+```
+* Merge pull request #695 from liamjbennett/vagrant_windows_fix (a7a85f72)
+
+
+```
+Merge pull request #695 from liamjbennett/vagrant_windows_fix
+
+(MAINT) Rolling back change for windows in the vagrant hypervisor
+```
+* Merge pull request #706 from madAndroid/GH-700-add-docker-options (8e0a7e7d)
+
+
+```
+Merge pull request #706 from madAndroid/GH-700-add-docker-options
+
+GH-700 - Allow Docker::options to be set from config hash
+```
+* Merge pull request #709 from kevpl/qeng1868_3.8_answers (cd980c9e)
+
+
+```
+Merge pull request #709 from kevpl/qeng1868_3.8_answers
+
+(QENG-1868) added 3.8 answers file, based on 3.7
+```
+* (QENG-1868) added 3.8 answers file, based on 3.7 (5ee004d4)
+
+* Merge pull request #707 from johnduarte/QENG-1867 (badb17a0)
+
+
+```
+Merge pull request #707 from johnduarte/QENG-1867
+
+(QENG-1867) Add ETIMEDOUT rescue to host.rb
+```
+* (QENG-1867) Add ETIMEDOUT rescue to host.rb (e7a2ed2d)
+
+
+```
+(QENG-1867) Add ETIMEDOUT rescue to host.rb
+
+This commit adds `Errno::ETIMEDOUT` to the rescue logic of the
+port_open? method in lib/beaker/host.rb.
+
+Adding this this rescue prevents the ETIMEDOUT error from short circuiting of
+the logical intention of the port_open? method.
+```
+* GH-700 - amend merge as per suggestion in #706 (6d56290a)
+
+* GH-700 - amend comments to be more appropriate (02591293)
+
+* GH-700 - handle the use case where ::Docker.options is nil (81836988)
+
+* Merge pull request #703 from sschneid/pooling_api_syntax_fixup (041f04ad)
+
+
+```
+Merge pull request #703 from sschneid/pooling_api_syntax_fixup
+
+(MAINT) use implicit trailing '/' for pooling_api URI
+```
+* (MAINT) use implicit trailing '/' for pooling_api URI (4d2e6f32)
+
+* (QENG-1852) install_puppet unable to install windows msi (regression) (76aba308)
+
+
+```
+(QENG-1852) install_puppet unable to install windows msi (regression)
+
+- busted curl command on windows
+- busted msiexec command for installation
+- i cry myself to sleep every night
+```
+* Merge pull request #698 from sschneid/batch_vm_checkout (b8a64f74)
+
+
+```
+Merge pull request #698 from sschneid/batch_vm_checkout
+
+(QENG-780) request sets of VMs instead of one VM at a time
+```
+* GH-700 - set ::Docker.options from docker_options in options hash, if it's not set via ::Docker.options already (7db8b636)
+
+* (QENG-780) Updating MockNet::HTTP::Post methods (72a07bd2)
+
+* (QENG-780) request sets of VMs instead of one VM at a time (9e82d9b6)
+
+
+```
+(QENG-780) request sets of VMs instead of one VM at a time
+
+This PR facilitates use of vmpooler's batch-request POST API
+(https://github.com/puppetlabs/vmpooler#post-vm) within beaker.
+```
+* Merge pull request #696 from kevpl/qeng1721_aio_quickadd (831a6c4e)
+
+
+```
+Merge pull request #696 from kevpl/qeng1721_aio_quickadd
+
+(QENG-1721) added a quick AIO override for windows to unblock testing
+```
+* (QENG-1721) added a quick AIO override for windows to unblock testing (ba6ba605)
+
+* (MAINT) Rolling back change for windows in the vagrant hypervisor (16741375)
+
+
+```
+(MAINT) Rolling back change for windows in the vagrant hypervisor
+
+Rolling back the change made in bf353c1 as it is no longer required.
+
+The subsequent change in 3aa080c for vagrant 1.7 properly fixed the issue
+and so the work around can now be removed.
+```
+* qeng1721: added AIO windows support (6f8deb7d)
+
+### <a name = "beaker2.4.1">beaker2.4.1 - 13 Feb, 2015 (84400ed1)
+
+* (HISTORY) update beaker history for gem release 2.4.1 (84400ed1)
 
 * (GEM) update beaker version to 2.4.1 (c3cffad8)
 

data/lib/beaker/answers.rb

@@ -19,6 +19,8 @@ module Beaker
         return Version34.new(version, hosts, options)
       when /\A3\.99/
         return Version40.new(version, hosts, options)
+      when /\A3\.8/
+        return Version34.new(version, hosts, options)
       when /\A3\.7/
         return Version34.new(version, hosts, options)
       when /\A3\.4/

data/lib/beaker/dsl/helpers.rb

@@ -1249,7 +1249,14 @@ module Beaker
           # In all the case that it is different, this init script will exist. So we can assume
           # that if the script doesn't exist, we should just use `pe-puppet`
           result = on agent, "[ -e /etc/init.d/pe-puppet-agent ]", :acceptable_exit_codes => [0,1]
-          agent_service = (result.exit_code == 0) ? 'pe-puppet-agent' : 'pe-puppet'
+          agent_service = 'pe-puppet-agent'
+          if result.exit_code != 0
+            if agent['pe_ver'] && !version_is_less(agent['pe_ver'], '4.0')
+              agent_service = 'puppet'
+            else
+              agent_service = 'pe-puppet'
+            end
+          end
 
           # Under a number of stupid circumstances, we can't stop the
           # agent using puppet.  This is usually because of issues with

data/lib/beaker/dsl/install_utils.rb

@@ -478,11 +478,18 @@ module Beaker
             host['dist'] = "puppet-enterprise-#{version}-#{host['platform']}"
           elsif host['platform'] =~ /windows/
             version = host[:pe_ver] || opts['pe_ver_win']
+            should_install_64bit = !(version_is_less(version, '3.4')) && host.is_x86_64? && !host['install_32'] && !opts['install_32']
             #only install 64bit builds if
             # - we are on pe version 3.4+
             # - we do not have install_32 set on host
             # - we do not have install_32 set globally
-            if !(version_is_less(version, '3.4')) and host.is_x86_64? and not host['install_32'] and not opts['install_32']
+            if !(version_is_less(version, '4.0'))
+              if should_install_64bit
+                host['dist'] = "puppet-agent-#{version}-x64"
+              else
+                host['dist'] = "puppet-agent-#{version}-x86"
+              end
+            elsif should_install_64bit
               host['dist'] = "puppet-enterprise-#{version}-x64"
             else
               host['dist'] = "puppet-enterprise-#{version}"
@@ -807,8 +814,8 @@ module Beaker
         end
 
         if host['is_cygwin'].nil? or host['is_cygwin'] == true
-          dest = "/cygdrive/c/Windows/Temp/#{host['dist']}.msi"
-          on host, "curl -O #{dest} #{link}"
+          dest = "#{host['dist']}.msi"
+          on host, "curl -O #{link}"
 
           #Because the msi installer doesn't add Puppet to the environment path
           #Add both potential paths for simplicity
@@ -826,7 +833,7 @@ module Beaker
           on host, "if not exist #{host['distmoduledir']} (md #{host['distmoduledir']})"
         end
 
-        on host, "msiexec /qn /i #{dest}"
+        on host, "cmd /C 'start /w msiexec.exe /qn /i #{dest}'"
       end
 
       # Installs Puppet and dependencies from dmg

data/lib/beaker/host/windows.rb

@@ -39,8 +39,8 @@ module Windows
         'user'              => 'Administrator',
         'group'             => 'Administrators',
         'puppetpath'        => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
-        'puppetconfdir'        => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
-        'puppetcodedir'        => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
+        'puppetconfdir'     => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
+        'puppetcodedir'     => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
         'hieraconf'         => '`cygpath -smF 35`/Puppetlabs/puppet/etc/hiera.yaml',
         'puppetvardir'      => '`cygpath -smF 35`/PuppetLabs/puppet/var',
         'distmoduledir'     => '`cygpath -smF 35`/PuppetLabs/puppet/etc/modules',
@@ -48,10 +48,14 @@ module Windows
         'hieralibdir'       => '`cygpath -w /opt/puppet-git-repos/hiera/lib`',
         'hierapuppetlibdir' => '`cygpath -w /opt/puppet-git-repos/hiera-puppet/lib`',
         #let's just add both potential bin dirs to the path, include ruby too for `gem`, `ruby`, etc
-        'puppetbindir'  => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
+        'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
         'hierabindir'       => '/opt/puppet-git-repos/hiera/bin',
         'pathseparator'     => ';',
       })
     end
+
+    def self.aio_defaults
+      self.foss_defaults
+    end
   end
 end

data/lib/beaker/host.rb

@@ -81,7 +81,7 @@ module Beaker
           TCPSocket.new(reachable_name, port).close
           return true
         end
-      rescue Errno::ECONNREFUSED, Timeout::Error
+      rescue Errno::ECONNREFUSED, Timeout::Error, Errno::ETIMEDOUT
         return false
       end
     end

data/lib/beaker/hypervisor/docker.rb

@@ -8,7 +8,9 @@ module Beaker
       @hosts = hosts
 
       # increase the http timeouts as provisioning images can be slow
-      ::Docker.options = { :write_timeout => 300, :read_timeout => 300 }.merge(::Docker.options || {})
+      default_docker_options = { :write_timeout => 300, :read_timeout => 300 }.merge(::Docker.options || {})
+      # Merge docker options from the entry in hosts file
+      ::Docker.options = default_docker_options.merge(@options[:docker_options] || {})
       # assert that the docker-api gem can talk to your docker
       # enpoint.  Will raise if there is a version mismatch
       begin

data/lib/beaker/hypervisor/vagrant.rb

@@ -72,9 +72,7 @@ module Beaker
         end
         #replace hostname with ip
         ssh_config = ssh_config.gsub(/Host #{host.name}/, "Host #{host['ip']}") unless not host['ip']
-        if host['platform'] =~ /windows/
-          ssh_config = ssh_config.gsub(/127\.0\.0\.1/, host['ip']) unless not host['ip']
-        end
+
         #set the user
         ssh_config = ssh_config.gsub(/User vagrant/, "User #{user}")
         f.write(ssh_config)

data/lib/beaker/hypervisor/vcloud_pooled.rb

@@ -51,7 +51,9 @@ module Beaker
     end
 
     def provision
+      request_payload = {}
       start = Time.now
+
       @hosts.each_with_index do |h, i|
         if not h['template']
           raise ArgumentError, "You must specify a template name for #{h}"
@@ -61,39 +63,50 @@ module Beaker
           h['template'] = templatefolders.pop
         end
 
-        @logger.notify "Requesting '#{h['template']}' VM from vCloud host pool"
+        request_payload[h['template']] = (request_payload[h['template']].to_i + 1).to_s
+      end
 
-        last_wait, wait = 0, 1
-        waited = 0 #the amount of time we've spent waiting for this host to provision
-        begin
-          uri = URI.parse(get_template_url(@options['pooling_api'], h['template']))
+      @logger.notify "Requesting VM set from vCloud host pool"
 
-          http = Net::HTTP.new( uri.host, uri.port )
-          request = Net::HTTP::Post.new(uri.request_uri)
+      last_wait, wait = 0, 1
+      waited = 0 #the amount of time we've spent waiting for this host to provision
+      begin
+        uri = URI.parse(@options['pooling_api'] + '/vm/')
 
-          request.set_form_data({'pool' => @options['resourcepool'], 'folder' => 'foo'})
+        http = Net::HTTP.new(uri.host, uri.port)
+        request = Net::HTTP::Post.new(uri.request_uri)
+
+        request.body = request_payload.to_json
+
+        response = http.request(request)
+        parsed_response = JSON.parse(response.body)
+
+        if parsed_response['ok']
+          domain = parsed_response['domain']
+
+          @hosts.each_with_index do |h, i|
+            if parsed_response[h['template']]['hostname'].is_a?(Array)
+              hostname = parsed_response[h['template']]['hostname'].shift
+            else
+              hostname = parsed_response[h['template']]['hostname']
+            end
 
-          response = http.request(request)
-          parsed_response = JSON.parse(response.body)
-          if parsed_response[h['template']] && parsed_response[h['template']]['ok'] && parsed_response[h['template']]['hostname']
-            hostname = parsed_response[h['template']]['hostname']
-            domain = parsed_response['domain']
             h['vmhostname'] = domain ? "#{hostname}.#{domain}" : hostname
-          else
-            raise "VcloudPooled.provision - no vCloud host free for #{h.name} in pool"
-          end
-        rescue JSON::ParserError, RuntimeError, *SSH_EXCEPTIONS => e
-          if waited <= @options[:timeout].to_i
-            @logger.debug("Retrying provision for vCloud host #{h.name} after waiting #{wait} second(s) (failed with #{e.class})")
-            sleep wait
-            waited += wait
-            last_wait, wait = wait, last_wait + wait
-            retry
+
+            @logger.notify "Using available vCloud host '#{h['vmhostname']}' (#{h.name})"
           end
-          report_and_raise(@logger, e, 'vCloudPooled.provision')
+        else
+          raise "VcloudPooled.provision - requested vCloud hosts not available"
         end
-
-        @logger.notify "Using available vCloud host '#{h['vmhostname']}' (#{h.name})"
+      rescue JSON::ParserError, RuntimeError, *SSH_EXCEPTIONS => e
+        if waited <= @options[:timeout].to_i
+          @logger.debug("Retrying provision for vCloud host after waiting #{wait} second(s) (failed with #{e.class})")
+          sleep wait
+          waited += wait
+          last_wait, wait = wait, last_wait + wait
+        retry
+        end
+        report_and_raise(@logger, e, 'vCloudPooled.provision')
       end
 
       @logger.notify 'Spent %.2f seconds grabbing VMs' % (Time.now - start)

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.4.1'
+    STRING = '2.5.0'
   end
 end

data/spec/beaker/dsl/install_utils_spec.rb

@@ -354,6 +354,7 @@ describe ClassMixedWithDSLInstallUtils do
       allow( subject ).to receive( :sign_certificate_for ).and_return( true )
       allow( subject ).to receive( :stop_agent_on ).and_return( true )
       allow( subject ).to receive( :sleep_until_puppetdb_started ).and_return( true )
+      allow( subject ).to receive( :version_is_less ).with('3.0', '4.0').and_return( true )
       allow( subject ).to receive( :version_is_less ).with('3.0', '3.4').and_return( true )
       allow( subject ).to receive( :version_is_less ).with('3.0', '3.0').and_return( false )
       allow( subject ).to receive( :version_is_less ).with('3.0', '3.4').and_return( true )
@@ -547,15 +548,15 @@ describe ClassMixedWithDSLInstallUtils do
       let(:platform) { "windows-2008r2-i386" }
       it 'installs specific version of puppet when passed :version' do
         allow(subject).to receive(:link_exists?).and_return( true )
-        expect(subject).to receive(:on).with(hosts[0], 'curl -O /cygdrive/c/Windows/Temp/puppet-3000.msi http://downloads.puppetlabs.com/windows/puppet-3000.msi')
+        expect(subject).to receive(:on).with(hosts[0], 'curl -O http://downloads.puppetlabs.com/windows/puppet-3000.msi')
         expect(subject).to receive(:on).with(hosts[0], " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
-        expect(subject).to receive(:on).with(hosts[0], 'msiexec /qn /i /cygdrive/c/Windows/Temp/puppet-3000.msi')
+        expect(subject).to receive(:on).with(hosts[0], 'cmd /C \'start /w msiexec.exe /qn /i puppet-3000.msi\'')
         subject.install_puppet(:version => '3000')
       end
       it 'installs from custom url when passed :win_download_url' do
         allow(subject).to receive(:link_exists?).and_return( true )
-        expect(subject).to receive(:on).with(hosts[0], 'curl -O /cygdrive/c/Windows/Temp/puppet-3000.msi http://nightlies.puppetlabs.com/puppet-latest/repos/windows/puppet-3000.msi')
-        expect(subject).to receive(:on).with(hosts[0], 'msiexec /qn /i /cygdrive/c/Windows/Temp/puppet-3000.msi')
+        expect(subject).to receive(:on).with(hosts[0], 'curl -O http://nightlies.puppetlabs.com/puppet-latest/repos/windows/puppet-3000.msi')
+        expect(subject).to receive(:on).with(hosts[0], 'cmd /C \'start /w msiexec.exe /qn /i puppet-3000.msi\'')
         subject.install_puppet( :version => '3000', :win_download_url => 'http://nightlies.puppetlabs.com/puppet-latest/repos/windows' )
       end
     end

data/spec/mocks.rb

@@ -39,8 +39,8 @@ module MockNet
         @uri = uri
       end
 
-      def set_form_data hash
-
+      def body= *args
+        hash
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -533,7 +533,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet!