beaker 3.19.0 → 3.20.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmYyZWQyNGMxMzRkNDZlOWZlODBiYWU4YTBmZmY2YzgzNGI0ODI5NA==
+    NDQ3ZThiZTEzNTZkODA0ZTQ3YjI1NDA5MzkxZTAzMDE4NjljM2M1Zg==
   data.tar.gz: !binary |-
-    Nzk2Njc3NDM0YmNhODliNTM5NjllZjUxMmM5NzRmZTAyMDc0OTMyOA==
+    NjVhMDY5ZDE5ZmI0ZTc0OWQ4MTIyZGM5YWM2YTVhNTc2YjUyMGYyMw==
 SHA512:
   metadata.gz: !binary |-
-    OTcwOWRlZDhkODc1YzBlNjNlZWVjNGI1MjA1YmRhNmUxNjZmMWMxZGQ0OGM2
-    NTM2NjdlMjZhYTVkZDQyNzcxMDQxMmFmZDM1YzgyZjk4MDE5MGJhNGY4MWVl
-    NjU2YTY2Mzk2OWJmYmJiMzQxMDdmYWJiZGQ2MzIyZGFkNzJhNTc=
+    Y2Q1ZDBjOGVmMGJkNzA2MmVjMGFmOGUzNWRlMTEzZjVlNTkxZTA5ODkwNmU2
+    ZjdjZTFiMTdmZjg5OTVlNDMwMmQ0NjI5MDhiYTRlNzg4ZTFhMjQ4NGExODJk
+    OTgxN2RmMTkyM2Q0MmNmOTg5ZjMwNTBlZTRlZDI1MjFhNThlYjE=
   data.tar.gz: !binary |-
-    OGUwMDhjMjViM2Y4ZTM2YjM3ZmM4MzRmOWFmYTk1YWE2ZDk5YzQ0ZjcxM2E1
-    YjE4MDYxZGE4NmQyZTFiY2MxMTc5Y2UxOTdjYTE1YTFkNTMzNDEyMGExNmU2
-    MDcwNTE4NTQzY2QxNjEzYTg3MDU5Zjg3YjU4NTI0YzA5NjRjZWM=
+    ODJhZTkyNDgzMzA4Y2M2Y2FhNGJiOGI3YTI3NWQ5NjAzNzg5NTEyNTNmZjFj
+    MzIyMjYyNDlmNjQ3ZDUwNTlmNGM2YWM2YjBiZWYwNzcyNjU3MjY2NmExZWQ5
+    MTlmMjYxMTVkMDU0YzQ1ODllNDEzZjY1YzIzNzRlYWFjMGZiNjY=

data/acceptance/tests/base/dsl/install_utils/clone_git_repo_on_test.rb

@@ -7,6 +7,8 @@ begin
   extend Beaker::Acceptance::InstallUtils
 end
 
+confine :except, :platform => /^solaris-10/
+
 test_name 'Clone from git' do
 
   PACKAGES = {

data/acceptance/tests/base/host/host_test.rb

@@ -228,7 +228,7 @@ hosts.each do |host|
   logger.debug("can recursively copy a module over, ignoring some files/dirs")
   #make sure that we are clean on the test host
   host.rm_rf("module")
-  host.do_scp_to(module_fixture, ".", {:ignore => ['vendor', 'Gemfile']})
+  host.do_scp_to(module_fixture, ".", {:ignore => ['tests', 'Gemfile']})
   Dir.mktmpdir do |tmp_dir|
     #grab copy from host
     host.do_scp_from("module", tmp_dir, {})
@@ -239,7 +239,7 @@ hosts.each do |host|
     local_paths.each do |path|
       search_name = path.gsub(/^.*fixtures\//, '') #reduce down to the path that should match
       matched = host_paths.select{ |check| check =~ /#{Regexp.escape(search_name)}$/ }
-      re =  /((\/|\A)vendor(\/|\z))|((\/|\A)Gemfile(\/|\z))/
+      re =  /((\/|\A)tests(\/|\z))|((\/|\A)Gemfile(\/|\z))/
       if path !~ re
         assert_equal(1, matched.length, "should have found a single instance of path #{search_name}, found #{matched.length}: \n #{matched}")
       else

data/beaker.gemspec

@@ -51,12 +51,12 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'beaker-puppet', '~> 0.0'
 
   # Optional provisioner specific support
-  s.add_runtime_dependency 'rbvmomi', '~> 1.9'
   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-vmpooler', '~> 0.1'
 
   # So fog doesn't always complain of unmet AWS dependencies
   s.add_runtime_dependency 'unf', '~> 0.1'

data/docs/concepts/beaker_libraries.md

@@ -16,4 +16,5 @@ To learn how to create beaker libraries, see the [Beaker-Template](https://githu
 | beaker-http | Adds ability to dispatch http traffic from the coordinator | [Github Repo](https://github.com/puppetlabs/beaker-http/) |
 | Beaker Rubymine Plugin | An IntelliJ IDEA plugin making Beaker test runs a native IDE experience | [Github Repo](https://github.com/samwoods1/BeakerRubyMinePlugin) |
 | beaker-rspec | A bridge between beaker itself and [rspec](https://github.com/rspec/rspec); also integrates [serverspec](http://serverspec.org/) | [Github Repo](https://github.com/puppetlabs/beaker-rspec/) |
+| beaker-puppet | Adds helper & install methods for Puppet-specific tasks | [Github Repo](https://github.com/puppetlabs/beaker-puppet/)
 

data/docs/how_to/hypervisors/README.md

@@ -32,17 +32,22 @@ that are needed for it. An example `.fog` file is below:
 
 # External Hypervisors
 
-There are a number of community-supported hypervisors that have not been added to
-Beaker itself. The reason for this is that we're looking to decrease Beaker's
+Puppetlabs and its community have made several gems that support different hypervisors with beaker, the reason for this is that we're looking to decrease Beaker's
 dependency footprint, and hypervisors are one of the places where we can often
 increase the load across all Beaker uses to benefit a small group that uses a
-particular hypervisor.
+particular hypervisor. 
 
-In order to offset this, we've made a listing of forks below that support other
-hypervisors not included in Beaker. Please check them out if you'd
-like to use their hypervisor, hopefully it'll save you from spending time
-trying to support a new hypervisor yourself.
+In order to offset this, we've made a listing of gems and community-supported forks that support other external hypervisors. Please check them out if you'd like to use those hypervisors, hopefully it'll save you from spending time trying to support a new hypervisor yourself.
 
-| Hypervisor | Fork                                               |
-|:----------:|:--------------------------------------------------:|
-| LXC        | [Obmondo](https://github.com/Obmondo/beaker) |
+Hypervisor gems made by puppet (pre-included in beaker 3.x):
+
+| Hypervisor             | Fork                                                      |
+|:----------------------:|:---------------------------------------------------------:|
+| Vmpooler        | [beaker-vmpooler](https://github.com/puppetlabs/beaker-vmpooler) |
+
+Hypervisor gems and beaker forks made by community:
+
+| Hypervisor   | Fork                                                                 |
+|:------------:|:--------------------------------------------------------------------:|
+| LXC          | [Obmondo](https://github.com/Obmondo/beaker)                         |
+| DigitalOcean | [beaker-digitalocean](https://github.com/tiengo/beaker-digitalocean) |

data/docs/how_to/hypervisors/aws.md

@@ -66,11 +66,14 @@ the AWS hypervisor to provision hosts properly.  They come in this form:
       hypervisor: ec2
       snapshot: <type>
       amisize: <ami-size>
+      platform: <platform-name>
 
 The `host-vmname-value` references the ID created in the Amazon Image Config file
 above.  If not provided, Beaker will try to name an AMI Config using the host's
 platform string.
 
+**Note:** If you are using `amazon-6-x86_64` as `vmname`, you have to specify `platform` as `el-6-x86_64`. Similarly for `amazon-6-i386` use `el-6-i386` as `platform`. 
+
 The `type` references the type variable in the Amazon Image Config file as well,
 so this key picks out the particular AMI ID from the set available for this type
 of host platform.

data/docs/how_to/hypervisors/vsphere.md

@@ -3,7 +3,7 @@ that beaker will use to get Systems Under Test (SUTs) from any vSphere
 infrastructure that you might have.
 
 **Note** that if you're a puppet-internal user, or an external user that is
-using the vmpooler hypervisor, please refer to our [vmpooler doc](vmpooler.md)
+using the vmpooler hypervisor, please refer to our [vmpooler doc](https://github.com/puppetlabs/beaker-vmpooler)
 for info, as it can be different than the information here. 
 
 The harness can use vms and snapshots that live within vSphere as well.

data/lib/beaker/command.rb

@@ -78,7 +78,11 @@ module Beaker
       end
 
       # This will cause things like `puppet -t -v agent` which is maybe bad.
-      cmd_line_array = [env_string, prepend_commands, cmd, options_string, args_string]
+      if host[:platform] =~ /cisco/ 
+        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]
+      end
       cmd_line_array << append_command unless (cmd =~ /ntpdate/ && host[:platform] =~ /cisco_nexus/)
       cmd_line_array.compact.reject( &:empty? ).join( ' ' )
     end

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

@@ -26,7 +26,7 @@ module Unix::Exec
     if self['platform'].include?('solaris') || self['platform'].include?('osx')
       execute("ifconfig -a inet| awk '/broadcast/ {print $2}' | cut -d/ -f1 | head -1").strip
     else
-      execute("ip a|awk '/global/{print$2}' | cut -d/ -f1 | head -1").strip
+      execute("ip a | awk '/global/{print$2}' | cut -d/ -f1 | #{self['hypervisor'] == 'vagrant' ? 'tail' : 'head'} -1").strip
     end
   end
 

data/lib/beaker/hypervisor.rb

@@ -32,14 +32,6 @@ module Beaker
           Beaker::Fusion
         when /^ec2$/
           Beaker::AwsSdk
-        when /^vmpooler$/
-          Beaker::Vmpooler
-        when /^vcloud$/
-          if options['pooling_api']
-            Beaker::Vmpooler
-          else
-            Beaker::Vcloud
-          end
         when /^vagrant$/
           Beaker::Vagrant
         when /^vagrant_custom$/
@@ -150,6 +142,22 @@ module Beaker
   end
 end
 
-[ 'vsphere_helper', 'vagrant', 'vagrant_custom', 'vagrant_virtualbox', 'vagrant_parallels', 'vagrant_libvirt', 'vagrant_fusion', 'vagrant_workstation', 'fusion', 'aws_sdk', 'vsphere', 'vmpooler', 'vcloud', 'docker', 'google_compute', 'openstack', 'noop' ].each do |lib|
+[
+  '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}"
 end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -649,6 +649,14 @@ module Beaker
           else
             next if host['platform'] =~ /netscaler/
             host.exec(Command.new("hostname #{host.name}"))
+            if host['vmname'] =~ /^amazon/
+              # Amazon Linux requires this to preserve host name changes across reboots.
+              # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/set-hostname.html
+              # Also note that without an elastic ip set, while this will
+              # preserve the hostname across a full shutdown/startup of the vm
+              # (as opposed to a reboot) -- the ip address will have changed. 
+              host.exec(Command.new("sed -ie '/^HOSTNAME/ s/=.*/=#{host.name}/' /etc/sysconfig/network"))
+            end
           end
         end
       else
@@ -660,6 +668,10 @@ module Beaker
           else
             next if host['platform'] =~ /netscaler/
             host.exec(Command.new("hostname #{host.hostname}"))
+            if host['vmname'] =~ /^amazon/
+              # See note above
+              host.exec(Command.new("sed -ie '/^HOSTNAME/ s/=.*/=#{host.hostname}/' /etc/sysconfig/network"))
+            end
           end
         end
       end

data/lib/beaker/hypervisor/vagrant.rb

@@ -175,7 +175,24 @@ module Beaker
       if @options[:provision]
         #setting up new vagrant hosts
         #make sure that any old boxes are dead dead dead
-        vagrant_cmd("destroy --force") if File.file?(@vagrant_file)
+        begin
+          vagrant_cmd("destroy --force") if File.file?(@vagrant_file)
+        rescue RuntimeError => e
+          # LATER: use <<~MESSAGE once we're on Ruby 2.3
+          @logger.debug(%Q{
+            Beaker failed to destroy the existing VM's. If you think this is
+            an error or you upgraded from an older version of beaker try
+            verifying the VM exists and deleting the existing Vagrantfile if
+            you believe it is safe to do so. WARNING: If a VM still exists
+            please run 'vagrant destroy'.
+
+            cd #{@vagrant_path}
+            vagrant status
+            vagrant destroy # only need to run this is a VM is not created
+            rm #{@vagrant_file} # only do this if all VM's are actually destroyed
+          }.each_line.map(&:strip).join("\n"))
+          raise e
+        end
 
         make_vfile @hosts, @options
 

data/lib/beaker/version.rb

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

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -516,12 +516,20 @@ describe Beaker do
     it "can exec the get_ip command" do
       host = make_host('name', { :stdout => "192.168.2.130\n" } )
 
-      expect( Beaker::Command ).to receive( :new ).with( "ip a|awk '/global/{print$2}' | cut -d/ -f1 | head -1", [], {:prepend_cmds=>nil, :cmdexe=>false} ).once
+      expect( Beaker::Command ).to receive( :new ).with( "ip a | awk '/global/{print$2}' | cut -d/ -f1 | head -1", [], {:prepend_cmds=>nil, :cmdexe=>false} ).once
 
       expect( subject.get_ip( host ) ).to be === "192.168.2.130"
 
     end
 
+    it "can exec the get_ip command with tail with vagrant hypervisor" do
+      host = make_host('name', { :stdout => "192.168.2.131\n", :hypervisor => "vagrant" } )
+
+      expect( Beaker::Command ).to receive( :new ).with( "ip a | awk '/global/{print$2}' | cut -d/ -f1 | tail -1", [], {:prepend_cmds=>nil, :cmdexe=>false} ).once
+
+      expect( subject.get_ip( host ) ).to be === "192.168.2.131"
+    end
+
   end
 
   context "set_etc_hosts" do

data/spec/beaker/hypervisor/hypervisor_spec.rb

@@ -4,6 +4,10 @@ module Beaker
   describe Hypervisor do
     let( :hypervisor ) { Beaker::Hypervisor }
 
+    it "includes custom hypervisor" do
+      expect{ hypervisor.create('custom_hypervisor', [], make_opts() )}.to raise_error(RuntimeError, "Invalid hypervisor: custom_hypervisor")
+    end
+
     it "creates a vsphere hypervisor for vsphere hosts" do
       vsphere = double( 'vsphere' )
       allow( vsphere ).to receive( :provision ).and_return( true )
@@ -18,20 +22,6 @@ module Beaker
       expect( hypervisor.create( 'fusion', [], make_opts() ) ).to be === fusion
     end
 
-    it "creates a vmpooler hypervisor for hosts that are pooled" do
-      vcloud = double( 'vcloud' )
-      allow( vcloud ).to receive( :provision ).and_return( true )
-      expect( Vmpooler ).to receive( :new ).once.and_return( vcloud )
-      expect( hypervisor.create( 'vcloud', [], make_opts().merge( { 'pooling_api' => true } ) ) ).to be === vcloud
-    end
-
-    it "creates a vcloud hypervisor for vcloud hosts that are not pooled" do
-      vcloud = double( 'vcloud' )
-      allow( vcloud ).to receive( :provision ).and_return( true )
-      expect( Vcloud ).to receive( :new ).once.and_return( vcloud )
-      expect( hypervisor.create( 'vcloud', [], make_opts().merge( { 'pooling_api' => false } ) ) ).to be === vcloud
-    end
-
     it "creates a vagrant hypervisor for vagrant hosts" do
       vagrant = double( 'vagrant' )
       allow( vagrant ).to receive( :provision ).and_return( true )

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -420,6 +420,13 @@ EOF
         vagrant.provision
       end
 
+      it "notifies user of failed provision" do
+        vagrant.provision
+        expect( vagrant ).to receive( :vagrant_cmd ).with( "destroy --force" ).and_raise( RuntimeError )
+        expect( options['logger'] ).to receive( :debug ).with( /Vagrantfile/ )
+        expect{ vagrant.provision }.to raise_error( RuntimeError )
+      end
+
       it "can cleanup" do
         expect( vagrant ).to receive( :vagrant_cmd ).with( "destroy --force" ).once
         expect( FileUtils ).to receive( :rm_rf ).once

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.19.0
+  version: 3.20.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -304,20 +304,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: rbvmomi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: fission
   requirement: !ruby/object:Gem::Requirement
@@ -388,6 +374,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.38'
+- !ruby/object:Gem::Dependency
+  name: beaker-vmpooler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
@@ -564,7 +564,6 @@ files:
 - docs/how_to/hypervisors/vagrant.md
 - docs/how_to/hypervisors/vagrant_hosts_file_examples.md
 - docs/how_to/hypervisors/vagrant_libvirt.md
-- docs/how_to/hypervisors/vmpooler.md
 - docs/how_to/hypervisors/vmware_fusion.md
 - docs/how_to/hypervisors/vsphere.md
 - docs/how_to/install_puppet.md
@@ -663,8 +662,6 @@ files:
 - lib/beaker/hypervisor/vagrant_parallels.rb
 - lib/beaker/hypervisor/vagrant_virtualbox.rb
 - lib/beaker/hypervisor/vagrant_workstation.rb
-- lib/beaker/hypervisor/vcloud.rb
-- lib/beaker/hypervisor/vmpooler.rb
 - lib/beaker/hypervisor/vsphere.rb
 - lib/beaker/hypervisor/vsphere_helper.rb
 - lib/beaker/junit.xsl
@@ -750,8 +747,6 @@ files:
 - spec/beaker/hypervisor/vagrant_spec.rb
 - spec/beaker/hypervisor/vagrant_virtualbox_spec.rb
 - spec/beaker/hypervisor/vagrant_workstation_spec.rb
-- spec/beaker/hypervisor/vcloud_spec.rb
-- spec/beaker/hypervisor/vmpooler_spec.rb
 - spec/beaker/hypervisor/vsphere_helper_spec.rb
 - spec/beaker/hypervisor/vsphere_spec.rb
 - spec/beaker/logger_junit_spec.rb

data/docs/how_to/hypervisors/vmpooler.md

@@ -1,45 +0,0 @@
-[vmpooler](https://github.com/puppetlabs/vmpooler) is a puppet-built abstraction
-layer over vSphere infrastructure that pools VMs to be used by beaker & other
-systems.
-
-beaker's vmpooler hypervisor interacts with vmpooler to get Systems Under Test
-(SUTs) for testing purposes.
-
-**Note** that if you're a puppet-internal user, you'll have to setup your SSH
-keys to communicate with vmpooler SUTs. To do that, refer to our
-[internal doc](https://confluence.puppetlabs.com/display/SRE/SSH+access+to+vmpooler+VMs).
-
-# Tokens
-
-Using tokens will allow you to extend your VMs lifetime, as well as interact
-with vmpooler and your VMs in more complex ways. You can have beaker do these
-same things by providing your `vmpooler_token` in the `~/.fog` file. For more
-info about how the `.fog` file works, please refer to the
-[hypervisor README](README.md).
-
-An example of a `.fog` file with just the vmpooler details is below:
-```yaml
-:default:
-  :vmpooler_token: 'randomtokentext'
-```
-# Additional Disks
-Using the vmpooler API, Beaker enables you to attach additional storage disks in the host configuration file. The disks are added at the time the VM is created. Logic for using the disk must go into your tests.
-
-Simply add the `disks` key and a list containing the sizes(in GB) of the disks you want to create and attach to that host.
-For example, to create 2 disks sized 8GB and 16GB to example-box:
-
-```yaml
- example-box:
-    disks:
-      - 8
-      - 16
-    roles:
-      - satellite
-    platform: el-7-x86_64
-    hypervisor: vmpooler
-    template: redhat-7-x86_64
-```
-
-Users with Puppet credentials can follow our instructions for getting & using
-vmpooler tokens in our
-[internal documentation](https://confluence.puppetlabs.com/pages/viewpage.action?spaceKey=SRE&title=Generating+and+using+vmpooler+tokens).