beaker 3.20.0 → 3.21.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDQ3ZThiZTEzNTZkODA0ZTQ3YjI1NDA5MzkxZTAzMDE4NjljM2M1Zg==
+    MmE5NjhiZTUwNGM4MzE4Y2IxMjY3YjVlZWYwNzFlNTYwNDNlODUwMA==
   data.tar.gz: !binary |-
-    NjVhMDY5ZDE5ZmI0ZTc0OWQ4MTIyZGM5YWM2YTVhNTc2YjUyMGYyMw==
+    MWViNWY1ZjJiNWVmYWU3N2QzMGMyZmQzZWQ0OGQ5YzVhYWQ5YjAzNQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2Q1ZDBjOGVmMGJkNzA2MmVjMGFmOGUzNWRlMTEzZjVlNTkxZTA5ODkwNmU2
-    ZjdjZTFiMTdmZjg5OTVlNDMwMmQ0NjI5MDhiYTRlNzg4ZTFhMjQ4NGExODJk
-    OTgxN2RmMTkyM2Q0MmNmOTg5ZjMwNTBlZTRlZDI1MjFhNThlYjE=
+    NzFiZmUzY2ZkNDU1MTkyOGU5OGJmZDE0OGI1ZjYwZmIwMDgxMzgyYjE5ZDky
+    NzBhZWQ0ZTNlZTMwMDZjODgyY2FmYTJhMWJiMDMxNWNiMjAxMTQ4NWExOWM1
+    OGY2MDlhYmZmMTFlZTk5ZjQyYmVlOGRhYTE0ZjM1OGM5MDZiN2E=
   data.tar.gz: !binary |-
-    ODJhZTkyNDgzMzA4Y2M2Y2FhNGJiOGI3YTI3NWQ5NjAzNzg5NTEyNTNmZjFj
-    MzIyMjYyNDlmNjQ3ZDUwNTlmNGM2YWM2YjBiZWYwNzcyNjU3MjY2NmExZWQ5
-    MTlmMjYxMTVkMDU0YzQ1ODllNDEzZjY1YzIzNzRlYWFjMGZiNjY=
+    ZGE5MGI0MWM5Y2U5MTYwMmQ2NGEzNmVkN2E3MTMzOGU0NDVjZGZkYTRlNWQ0
+    Y2FjMjMzY2I0OWQ5MmM5MjY3NGViZGIwNjg4ZTUyZDUzZDNmZDY1NzNkOTAz
+    NTJjNDRhMjVlOTU0YmNiYmEzYmI2MWEyZTI4ZmU1NmFiNWIyNmU=

data/beaker.gemspec

@@ -51,13 +51,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'beaker-puppet', '~> 0.0'
 
   # Optional provisioner specific support
-  s.add_runtime_dependency 'fission', '~> 0.4'
-  s.add_runtime_dependency 'google-api-client', '~> 0.9'
-  s.add_runtime_dependency 'aws-sdk-v1', '~> 1.57'
   s.add_runtime_dependency 'docker-api'
   s.add_runtime_dependency 'fog', '~> 1.38'
+  s.add_runtime_dependency 'beaker-aws', '~> 0.1'
   s.add_runtime_dependency 'beaker-vmpooler', '~> 0.1'
+  s.add_runtime_dependency 'beaker-google', '~> 0.1'
+  s.add_runtime_dependency 'beaker-vagrant', '~> 0.1'
+  s.add_runtime_dependency 'beaker-vmware', '~> 0.1'
 
-  # So fog doesn't always complain of unmet AWS dependencies
-  s.add_runtime_dependency 'unf', '~> 0.1'
 end

data/docs/how_to/hypervisors/README.md

@@ -41,9 +41,13 @@ In order to offset this, we've made a listing of gems and community-supported fo
 
 Hypervisor gems made by puppet (pre-included in beaker 3.x):
 
-| Hypervisor             | Fork                                                      |
-|:----------------------:|:---------------------------------------------------------:|
-| Vmpooler        | [beaker-vmpooler](https://github.com/puppetlabs/beaker-vmpooler) |
+| Hypervisor               | Fork                                                             |
+| :----------------------: | :---------------------------------------------------------:      |
+| Vmpooler                 | [beaker-vmpooler](https://github.com/puppetlabs/beaker-vmpooler) |
+| AWS                      | [beaker-aws](https://github.com/puppetlabs/beaker-aws)           |
+| Google Compute           | [beaker-google](https://github.com/puppetlabs/beaker-google)     |
+| Vagrant                  | [beaker-vagrant](https://github.com/puppetlabs/beaker-vagrant)   |
+| VMware/Vsphere           | [beaker-vmware](https://github.com/puppetlabs/beaker-vmware)     |
 
 Hypervisor gems and beaker forks made by community:
 

data/docs/tutorials/quick_start_rake_tasks.md

@@ -8,7 +8,7 @@ We have developed some rake tasks to help new Beaker users get up and running qu
 * You will need to have already completed the Beaker installation tutorial - [Beaker Installation](installation.md)
 
 * Hypervisors are services that provision SUTs for Beaker. We have made two available in this quick start guide to allow you to get up 
-and running. See the docs on how to setup [Vmpooler](../how_to/hypervisors/vsphere.md) and [Vagrant](../how_to/hypervisors/vagrant.md).
+and running. See the docs on how to setup [Vmpooler](https://github.com/puppetlabs/beaker-vmpooler/blob/master/vmpooler.md) and [Vagrant](https://github.com/puppetlabs/beaker-vagrant/blob/master/docs/vagrant.md).
 
 
 ## How to use them

data/lib/beaker/command.rb

@@ -78,7 +78,7 @@ module Beaker
       end
 
       # This will cause things like `puppet -t -v agent` which is maybe bad.
-      if host[:platform] =~ /cisco/ 
+      if host[:platform] =~ /cisco_ios_xr/ 
         cmd_line_array = [prepend_commands, env_string, cmd, options_string, args_string]
       else
         cmd_line_array = [env_string, prepend_commands, cmd, options_string, args_string]

data/lib/beaker/host.rb

@@ -242,9 +242,11 @@ module Beaker
     # Determine the ip address using logic specific to the hypervisor
     def get_public_ip
       case host_hash[:hypervisor]
-      when 'ec2'
-        if host_hash[:instance]
-          host_hash[:instance].ip_address
+      when /^(ec2|openstack)$/
+        if self[:hypervisor] == 'ec2' && self[:instance]
+          return self[:instance].ip_address
+        elsif self[:hypervisor] == 'openstack' && self[:ip]
+          return self[:ip]
         else
           # In the case of using ec2 instances with the --no-provision flag, the ec2
           # instance object does not exist and we should just use the curl endpoint
@@ -274,7 +276,7 @@ module Beaker
       # create new connection object if necessary
       @connection ||= SshConnection.connect( { :ip => self['ip'], :vmhostname => self['vmhostname'], :hostname => @name },
                                              self['user'],
-                                             self['ssh'], { :logger => @logger } )
+                                             self['ssh'], { :logger => @logger, :ssh_connection_preference => self[:ssh_connection_preference] } )
       # update connection information
       if self['ip'] && (@connection.ip != self['ip'])
         @connection.ip = self['ip']

data/lib/beaker/host/windows/exec.rb

@@ -108,4 +108,14 @@ module Windows::Exec
     false
   end
 
+  # Determine if cygwin is actually installed on the SUT. Differs from
+  # is_cygwin?, which is just a type check for a Windows::Host.
+  #
+  # @return [Boolean]
+  def cygwin_installed?
+    output = exec(Beaker::Command.new('cygcheck --check-setup cygwin'), :accept_all_exit_codes => true).stdout 
+    return true if output.match(/cygwin/) && output.match(/OK/)
+    false
+  end
+
 end

data/lib/beaker/host/windows/pkg.rb

@@ -12,9 +12,6 @@ module Windows::Pkg
   end
 
   def install_package(name, cmdline_args = '')
-    cygwin = ""
-    rootdir = ""
-
     arch = identify_windows_architecture
 
     if arch == '64'
@@ -25,15 +22,6 @@ module Windows::Pkg
       cygwin = "setup-x86.exe"
     end
 
-    if not check_for_command(cygwin)
-      command = "curl --retry 5 https://cygwin.com/#{cygwin} -o /cygdrive/c/Windows/System32/#{cygwin}"
-      begin
-        execute(command)
-      rescue Beaker::Host::CommandFailure
-        command.sub!('https', 'http')
-        execute(command)
-      end
-    end
     execute("#{cygwin} -q -n -N -d -R #{rootdir} -s http://cygwin.osuosl.org -P #{name} #{cmdline_args}")
   end
 
@@ -101,23 +89,7 @@ module Windows::Pkg
 
   # @api private
   def identify_windows_architecture
-    arch = nil
-    execute("echo '' | wmic os get osarchitecture", :accept_all_exit_codes => true) do |result|
-      arch = if result.exit_code == 0
-        result.stdout =~ /64/ ? '64' : '32'
-      else
-        identify_windows_architecture_from_os_name_for_win2003
-      end
-    end
-    arch
+    platform.arch =~ /64/ ? '64' : '32'
   end
 
-  # @api private
-  def identify_windows_architecture_from_os_name_for_win2003
-    arch = nil
-    execute("echo '' | wmic os get name | grep x64", :accept_all_exit_codes => true) do |result|
-      arch = result.exit_code == 0 ? '64' : '32'
-    end
-    arch
-  end
 end

data/lib/beaker/host_prebuilt_steps.rb

@@ -107,6 +107,7 @@ module Beaker
         when host['platform'] =~ /cumulus/
           check_and_install_packages_if_needed(host, CUMULUS_PACKAGES)
         when (host['platform'] =~ /windows/ and host.is_cygwin?)
+          raise RuntimeError, "cygwin is not installed on #{host}" if !host.cygwin_installed?
           check_and_install_packages_if_needed(host, WINDOWS_PACKAGES)
         when (host['platform'] =~ /windows/ and not host.is_cygwin?)
           check_and_install_packages_if_needed(host, PSWINDOWS_PACKAGES)

data/lib/beaker/hypervisor.rb

@@ -26,28 +26,6 @@ module Beaker
           Beaker::Aixer
         when /^solaris$/
           Beaker::Solaris
-        when /^vsphere$/
-          Beaker::Vsphere
-        when /^fusion$/
-          Beaker::Fusion
-        when /^ec2$/
-          Beaker::AwsSdk
-        when /^vagrant$/
-          Beaker::Vagrant
-        when /^vagrant_custom$/
-          Beaker::VagrantCustom
-        when /^vagrant_libvirt$/
-          Beaker::VagrantLibvirt
-        when /^vagrant_virtualbox$/
-          Beaker::VagrantVirtualbox
-        when /^vagrant_fusion$/
-          Beaker::VagrantFusion
-        when /^vagrant_workstation$/
-          Beaker::VagrantWorkstation
-        when /^vagrant_parallels$/
-          Beaker::VagrantParallels
-        when /^google$/
-          Beaker::GoogleCompute
         when /^docker$/
           Beaker::Docker
         when /^openstack$/
@@ -63,12 +41,12 @@ module Beaker
           rescue LoadError
             raise "Invalid hypervisor: #{type}"
           end
-          Beaker.const_get(type.capitalize)
+          Beaker.const_get(type.split('_').collect(&:capitalize).join)
         end
 
       hypervisor = hyper_class.new(hosts_to_provision, options)
+      self.set_ssh_connection_preference(hosts_to_provision, hypervisor)
       hypervisor.provision if options[:provision]
-
       hypervisor
     end
 
@@ -87,6 +65,29 @@ module Beaker
       nil
     end
 
+    DEFAULT_CONNECTION_PREFERENCE = ['ip', 'vmhostname', 'hostname']
+    #SSH connection method preference. Can be overwritten by hypervisor to change the order
+    def connection_preference
+      DEFAULT_CONNECTION_PREFERENCE
+    end
+
+    #Check if overriding method returns correct array with ip, vmhostname hostname as elements
+    def self.set_ssh_connection_preference(hosts_to_provision, hypervisor)
+      if hypervisor.connection_preference.sort == DEFAULT_CONNECTION_PREFERENCE.sort
+        hosts_to_provision.each{ |h| h[:ssh_connection_preference] = hypervisor.connection_preference}
+      else
+        raise ArgumentError, <<-HEREDOC
+Hypervisor's overriding connection_pereference method is not matching the API.
+
+Make sure your hypervisor's connection_preference returns an array
+containing the following elements in any order you prefer:
+"ip", "hostname", "vmhostname"
+
+Please check hypervisor.rb file's "self.connection_preference" method for an example
+        HEREDOC
+      end
+    end
+
     #Proxy package managers on tests hosts created by this hypervisor, runs before validation and configuration.
     def proxy_package_manager
       if @options[:package_proxy]
@@ -143,21 +144,9 @@ module Beaker
 end
 
 [
-  'vsphere_helper',
-  'vagrant',
-  'vagrant_custom',
-  'vagrant_virtualbox',
-  'vagrant_parallels',
-  'vagrant_libvirt',
-  'vagrant_fusion',
-  'vagrant_workstation',
-  'fusion',
-  'aws_sdk',
-  'vsphere',
   'docker',
-  'google_compute',
   'openstack',
   'noop'
 ].each do |lib|
-    require "beaker/hypervisor/#{lib}"
+  require "beaker/hypervisor/#{lib}"
 end

data/lib/beaker/ssh_connection.rb

@@ -6,7 +6,7 @@ module Beaker
   class SshConnection
 
     attr_accessor :logger
-    attr_accessor :ip, :vmhostname, :hostname
+    attr_accessor :ip, :vmhostname, :hostname, :ssh_connection_preference
 
     RETRYABLE_EXCEPTIONS = [
       SocketError,
@@ -33,6 +33,7 @@ module Beaker
       @ssh_opts = ssh_opts
       @logger = options[:logger]
       @options = options
+      @ssh_connection_preference = @options[:ssh_connection_preference]
     end
 
     def self.connect name_hash, user = 'root', ssh_opts = {}, options = {}
@@ -66,21 +67,13 @@ module Beaker
     # connect to the host
     def connect
       #try three ways to connect to host (vmhostname, ip, hostname)
-      methods = []
-      if @vmhostname
-        @ssh ||= connect_block(@vmhostname, @user, @ssh_opts)
-        methods << "vmhostname (#{@vmhostname})"
+      # Try each method in turn until we succeed
+      methods = @ssh_connection_preference.dup
+      while (not @ssh) && (not methods.empty?) do
+        @ssh = connect_block(instance_variable_get("@#{methods.shift}"), @user, @ssh_opts)
       end
-      if @ip && !@ssh
-        @ssh ||= connect_block(@ip, @user, @ssh_opts)
-        methods << "ip (#{@ip})"
-      end
-      if @hostname && !@ssh
-        @ssh ||= connect_block(@hostname, @user, @ssh_opts)
-        methods << "hostname (#{@hostname})"
-      end
-      if not @ssh
-        @logger.error "Failed to connect to #{@hostname}, attempted #{methods.join(', ')}"
+      unless @ssh
+        @logger.error "Failed to connect to #{@hostname}, attempted #{@ssh_connection_preference.join(', ')}"
         raise RuntimeError, "Cannot connect to #{@hostname}"
       end
       @ssh

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.20.0'
+    STRING = '3.21.0'
   end
 end

data/spec/beaker/dsl/install_utils/windows_utils_spec.rb

@@ -15,7 +15,7 @@ describe ClassMixedWithDSLInstallUtils do
   let( :batch_path )        { '/fake/batch/path' }
   let(:msi_path)            { 'c:\\foo\\puppet.msi' }
   let(:winhost)             { make_host( 'winhost',
-                              { :platform => 'windows',
+                            { :platform => Beaker::Platform.new('windows-2008r2-64'),
                                 :pe_ver => '3.0',
                                 :working_dir => '/tmp',
                                 :is_cygwin => true} ) }

data/spec/beaker/host/windows/exec_spec.rb

@@ -60,5 +60,23 @@ module Beaker
         instance.reboot
       end
     end
+
+    describe '#cygwin_installed?' do
+      let (:response) { double( 'response' ) }
+
+      it 'uses cygcheck to see if cygwin is installed' do
+        expect( Beaker::Command ).to receive(:new).with("cygcheck --check-setup cygwin").and_return(:foo)
+        expect( instance ).to receive( :exec ).with(:foo, :accept_all_exit_codes => true).and_return(response)
+        expect( response ).to receive(:stdout).and_return('cygwin OK')
+        expect(instance.cygwin_installed?).to eq(true)
+      end
+
+      it 'returns false when unable to find matching text' do
+        expect( Beaker::Command ).to receive(:new).with("cygcheck --check-setup cygwin").and_return(:foo)
+        expect( instance ).to receive( :exec ).with(:foo, :accept_all_exit_codes => true).and_return(response)
+        expect( response ).to receive(:stdout).and_return('No matching text')
+        expect(instance.cygwin_installed?).to eq(false)
+      end
+    end
   end
 end

data/spec/beaker/host/windows/pkg_spec.rb

@@ -39,17 +39,10 @@ module Beaker
         end
 
         it 'curls the SSL URL for cygwin\'s installer' do
-          expect( instance ).to receive( :execute ).with( /^curl.*https\:/  ).ordered
           allow(  instance ).to receive( :execute ).with( /^setup\-x86/     ).ordered
           instance.install_package( 'curl' )
         end
 
-        it 'falls back to the non-SSL URL if that one fails' do
-          allow(  instance ).to receive( :execute ).with( /^curl.*https\:/  ).and_raise( Beaker::Host::CommandFailure ).ordered
-          expect( instance ).to receive( :execute ).with( /^curl.*http\:/   ).ordered
-          allow(  instance ).to receive( :execute ).with( /^setup\-x86/     ).ordered
-          instance.install_package( 'curl' )
-        end
       end
     end
 

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -409,6 +409,7 @@ describe Beaker do
 
       hosts.each do |host|
         windows_pkgs.each do |pkg|
+          allow( host ).to receive( :cygwin_installed? ).and_return( true )
           allow( host ).to receive( :is_cygwin? ).and_return( true )
           expect( host ).to receive( :check_for_package ).with( pkg ).once.and_return( false )
           expect( host ).to receive( :install_package ).with( pkg ).once

data/spec/beaker/host_spec.rb

@@ -122,62 +122,31 @@ module Beaker
         let(:cygwin64) { 'setup-x86_64.exe' }
         let(:package) { 'foo' }
 
-        before(:each) do
-          @platform = 'windows'
-          allow( host ).to receive(:check_for_package).and_return(true)
-        end
-
         context "testing osarchitecture" do
 
-          before(:each) do
-            expect( host ).to receive(:execute).with(/wmic os get osarchitecture/, anything).and_yield(success_osarch_check)
-          end
-
-          context "32 bit" do
-            let(:success_osarch_check) { double(:success, :exit_code => 0, :stdout => '32-bit') }
-
-            it "uses 32 bit cygwin" do
-              expect( host ).to receive(:execute).with(/#{cygwin}.*#{package}/)
-              host.install_package(package)
-            end
-          end
-
           context "64 bit" do
-            let(:success_osarch_check) { double(:success, :exit_code => 0, :stdout => '64-bit') }
+            before do
+              @platform = Beaker::Platform.new('windows-2008r2-64')
+            end
 
             it "uses 64 bit cygwin" do
               expect( host ).to receive(:execute).with(/#{cygwin64}.*#{package}/)
               host.install_package(package)
             end
           end
-        end
-
-        context "testing os name" do
-          let(:failed_osarch_check) { double(:failed, :exit_code => 1) }
-
-          before(:each) do
-            expect( host ).to receive(:execute).with(/wmic os get osarchitecture/, anything).and_yield(failed_osarch_check)
-            expect( host ).to receive(:execute).with(/wmic os get name/, anything).and_yield(name_check)
-          end
 
           context "32 bit" do
-            let(:name_check) { double(:failure, :exit_code => 1) }
+            before do
+              @platform = Beaker::Platform.new('windows-10ent-32')
+            end
 
             it "uses 32 bit cygwin" do
               expect( host ).to receive(:execute).with(/#{cygwin}.*#{package}/)
               host.install_package(package)
             end
           end
-
-          context "64 bit" do
-            let(:name_check) { double(:success, :exit_code => 0) }
-
-            it "uses 64 bit cygwin" do
-              expect( host ).to receive(:execute).with(/#{cygwin64}.*#{package}/)
-              host.install_package(package)
-            end
-          end
         end
+
       end
     end
 
@@ -710,12 +679,17 @@ module Beaker
         host.get_public_ip
       end
 
+      it 'call upon openstack host to get the ip address' do
+        host.host_hash[:hypervisor] = 'openstack'
+        expect(host.get_public_ip).to be(host.host_hash[:ip])
+      end
+
       it 'returns nil when no matching hypervisor is found' do
         host.host_hash[:hypervisor] = 'vmpooler'
         expect(host.get_public_ip).to be(nil)
       end
 
-      it 'calls execute with curl if the host_hash[:instance] is not defined and the host is not an instance of Windows::Host' do
+      it 'calls execute with curl if the host_hash[:instance] is not defined for ec2 and the host is not an instance of Windows::Host' do
         host.host_hash[:hypervisor] = 'ec2'
         host.host_hash[:instance] = nil
         expect(host).to receive(:instance_of?).with(Windows::Host).and_return(false)
@@ -723,13 +697,30 @@ module Beaker
         host.get_public_ip
       end
 
-      it 'calls execute with wget if the host_hash[:instance] is not defined and the host is an instance of Windows::Host' do
+      it 'calls execute with wget if the host_hash[:instance] is not defined for ec2 and the host is an instance of Windows::Host' do
         host.host_hash[:hypervisor] = 'ec2'
         host.host_hash[:instance] = nil
         expect(host).to receive(:instance_of?).with(Windows::Host).and_return(true)
         expect(host).to receive(:execute).with("wget http://169.254.169.254/latest/meta-data/public-ipv4").and_return('127.0.0.1')
         host.get_public_ip
       end
+
+      it 'calls execute with curl if the host_hash[:ip] is not defined for openstack and the host is not an instance of Windows::Host' do
+        host.host_hash[:hypervisor] = 'openstack'
+        host.host_hash[:ip] = nil
+        expect(host).to receive(:instance_of?).with(Windows::Host).and_return(false)
+        expect(host).to receive(:execute).with("curl http://169.254.169.254/latest/meta-data/public-ipv4").and_return('127.0.0.1')
+        host.get_public_ip
+      end
+
+      it 'calls execute with wget if the host_hash[:ip] is not defined for openstack and the host is an instance of Windows::Host' do
+        host.host_hash[:hypervisor] = 'openstack'
+        host.host_hash[:ip] = nil
+        expect(host).to receive(:instance_of?).with(Windows::Host).and_return(true)
+        expect(host).to receive(:execute).with("wget http://169.254.169.254/latest/meta-data/public-ipv4").and_return('127.0.0.1')
+        host.get_public_ip
+      end
+
     end
 
     describe '#ip' do