beaker 2.50.0 → 2.51.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzlmMWE0ZTZiMmI4MmE4YmNkMTk1MmIwMGRmNTFiYmI1YWZkNThiNg==
+    NGUxMzhiNjE1NjU1NjRjZGRkMTllMjA1NjExYTMwNmFiZDI4MjNjMA==
   data.tar.gz: !binary |-
-    OGIyMjM5NTA0MGY4OGU2NjU0Mjk2MWZmMTM2OWZhNjYyMTEyNDk0ZA==
+    MDNkNjAyNmQzODM4MTk1NDQwNjgxODE0NDFhM2Q2NDFiOWQwZGU1Mg==
 SHA512:
   metadata.gz: !binary |-
-    NmY1Y2M3YTMzMWY4NzM4ODY4NzFmMmI1ZjIwZWVkOTY4MTIyZGFkMWQ2MzY2
-    ZTE5OWFiZGYwY2I3MGQ5NmYwM2I4YzJlMzc1NDMwNWE2YjM1ODViOTc3ODMw
-    NDZlZTE0ZmQ0OWM5MjlkOTQ2MzBlYmQ2OThmNzBkNWI4OTBmN2Q=
+    MTFjMWU2NWViNDJlOWQ5Njk4N2IyZDY3MWI0MWFiNTRlZTE4ZmRlYTEwZjk3
+    ZmZjODBhNGFkYmRmZTMwZjJhYWEwMTJkNzkwZTMzN2UyY2ZmMDI2OTBhMWFm
+    MzdiNGU2YTFiNjgwYzEzODFmNjY5MjNjZWNiMjRlY2I4ZGZjYTc=
   data.tar.gz: !binary |-
-    ZjMxMDlhYzcxZTk1ZDE0ODQ0ZDZiNzdiMWU2YjA0NjZjZGM2NzE3ODFkNGJk
-    OGQ4M2YzNDQwNGYyNTk1NGJkYWYwNTNhOThmZDhhMDRjNDM5YzY5MDFjYTQ5
-    MzZhNjY4MDhiMzcwOGZjMmM1YmJjZGE4ZWRhNjEyMjEyMDg5ZWI=
+    MTlhYmM2ZjdjN2ZkZmI3Mjc2MzI0YTkyYzY5Yzg1YzY3MTFhM2Y4YWUyOGYx
+    YmI3ZWQ2NDZjYzNjNGEyOGZiYjNhNjVkNTczOTE5ZDUzNjdiYjk0MDUxODJj
+    ZTU3MDY5NWZlZTAzNTU1NjQwODZiYTY1YmQ3MzI4MDc0OTk5YWY=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 22 Aug, 2016 (9358f2eb)](#LATEST)
+* [LATEST - 7 Sep, 2016 (fb109bdc)](#LATEST)
+* [2.50.0 - 22 Aug, 2016 (1f003a4d)](#2.50.0)
 * [2.49.0 - 11 Aug, 2016 (53ba3f14)](#2.49.0)
 * [2.48.1 - 29 Jul, 2016 (e5a52ad4)](#2.48.1)
 * [2.48.0 - 27 Jul, 2016 (47d3aa18)](#2.48.0)
@@ -128,7 +129,158 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 22 Aug, 2016 (9358f2eb)
+### <a name = "LATEST">LATEST - 7 Sep, 2016 (fb109bdc)
+
+* (GEM) update beaker version to 2.51.0 (fb109bdc)
+
+* Merge pull request #1237 from tvpartytonight/maint_maintainers (45a9c88d)
+
+
+```
+Merge pull request #1237 from tvpartytonight/maint_maintainers
+
+(maint) Add MAINTAINERS
+```
+* (maint) Add MAINTAINERS (f7d491fb)
+
+* Merge pull request #1232 from ferglor/BKR-888 (0e13b888)
+
+
+```
+Merge pull request #1232 from ferglor/BKR-888
+
+(BKR-888) install_puppet_agent_dev_repo_on prohibits passing different platforms
+```
+* Merge pull request #1235 from puppetlabs/revert-1233-bkr712_fix_preset (c0c69370)
+
+
+```
+Merge pull request #1235 from puppetlabs/revert-1233-bkr712_fix_preset
+
+Revert "(BKR-712) changed default to not cache files locally"
+```
+* Revert "(BKR-712) changed default to not cache files locally" (94e500b7)
+
+* Merge pull request #1220 from mmckinst/ENV_containter_docker (6d627526)
+
+
+```
+Merge pull request #1220 from mmckinst/ENV_containter_docker
+
+(BKR-528) Set ENV container docker
+```
+* (maint) Add security group option to openstack hypervisor initialization (#1229) (fff68bbb)
+
+
+```
+(maint) Add security group option to openstack hypervisor initialization (#1229)
+
+* Add security group option to openstack hypervisor
+
+* Setting hostname working
+
+* Update docs for sec group
+
+* Add spec tests for security group option
+
+* Adjust docs
+```
+* Merge pull request #1233 from kevpl/bkr712_fix_preset (391730f0)
+
+
+```
+Merge pull request #1233 from kevpl/bkr712_fix_preset
+
+(BKR-712) changed default to not cache files locally
+```
+* Merge pull request #1230 from kevpl/maint_maintainer_clarify (ff45ff66)
+
+
+```
+Merge pull request #1230 from kevpl/maint_maintainer_clarify
+
+(MAINT) clarify reviewer vs maintainer roles
+```
+* (BKR-712) changed default to not cache files locally (9c276bba)
+
+* (MAINT) clarify reviewer vs maintainer roles (4f8d322e)
+
+
+```
+(MAINT) clarify reviewer vs maintainer roles
+
+[skip ci]
+```
+* Merge pull request #1215 from petems/BKR-907-custom_vagrantfile_provisioner (5c66ae6f)
+
+
+```
+Merge pull request #1215 from petems/BKR-907-custom_vagrantfile_provisioner
+
+(BKR-907) Add vagrant_custom hypervisor
+```
+* (BKR-888) install_puppet_agent_dev_repo_on design prohibits passing hosts of different platforms (253e20c1)
+
+* Merge pull request #1225 from tvpartytonight/BKR-916 (0601467d)
+
+
+```
+Merge pull request #1225 from tvpartytonight/BKR-916
+
+(BKR-916) Use dns_name for ec2 hostnames
+```
+* (BKR-916) Use dns_name for ec2 hostnames (a5bbdab2)
+
+
+```
+(BKR-916) Use dns_name for ec2 hostnames
+
+Prior to this change, provisioning in ec2 would set each host's hostname
+to the `name` attribute of the host. This change removes that behavior
+and sets each host's hostname to be the public facing `dns_name`
+provided by ec2 to allow traffic from outside ec2 to route correctly to
+that host.
+```
+* (BKR-528) Set ENV container docker (9dcc8079)
+
+
+```
+(BKR-528) Set ENV container docker
+
+See below relevant links:
+
+* https://github.com/test-kitchen/kitchen-docker/pull/192
+* https://github.com/test-kitchen/kitchen-docker/pull/216
+* https://developerblog.redhat.com/2014/05/05/running-systemd-within-docker-container/
+```
+* (BKR-907) Add vagrant_custom hypervisor (bb596fa1)
+
+
+```
+(BKR-907) Add vagrant_custom hypervisor
+
+* Gives the ability to specify users own Vagrantfile
+* Useful if there's a bug in beaker, you have a custom Vagrant provider missing from Beaker...
+* or you just want to be super explicit about your Vagrantfile
+* Example:
+
+
+
+HOSTS:
+  trusty:
+    roles:
+      - apache
+    platform: ubuntu-1404-x86_64
+    hypervisor: vagrant_custom
+    box: trusty64
+CONFIG:
+  vagrantfile_path: /opt/testing/CustomVagrantfile
+
+
+```
+### <a name = "2.50.0">2.50.0 - 22 Aug, 2016 (1f003a4d)
+
+* (HISTORY) update beaker history for gem release 2.50.0 (1f003a4d)
 
 * (GEM) update beaker version to 2.50.0 (9358f2eb)
 

data/MAINTAINERS

@@ -0,0 +1,28 @@
+{
+  "version": 1,
+  "file_format": "This MAINTAINERS file format is described at https://github.com/puppetlabs/maintainers",
+  "issues": "https://tickets.puppet.com/browse/BKR",
+  "people": [
+    {
+      "github": "kevpl",
+      "email": "ki@puppet.com",
+      "name": "Kevin Imber"
+    },
+    {
+      "github": "tvpartytonight",
+      "email": "tv@puppet.com",
+      "name": "Tony Vu"
+    },
+    {
+      "github": "pinkypie",
+      "email": "sarah@puppet.com",
+      "name": "Sarah Thompson"
+    },
+    {
+      "github": "ferglor",
+      "email": "fergal@puppet.com",
+      "name": "Fergal Gribben"
+    }
+  ]
+}
+

data/MAINTAINERS.md

@@ -1,4 +1,4 @@
-# Reviewers/Maintainers For Beaker
+# Maintainers For Beaker
 
 Beaker is maintained by Puppet's Quality Engineering (QE) Team. These people
 will be reviewing & merging PRs to the project.
@@ -7,12 +7,13 @@ In particular, our current Beaker maintainers are:
 | Name           | Github                                              | Email                |
 |:--------------:|:---------------------------------------------------:|:--------------------:|
 | Kevin Imber    | [kevpl](https://github.com/kevpl)                   | <ki@puppet.com>      |
-| Tony Vu        | [tvpartytonight](https://github.com/tvpartytonight) | <tony.vu@puppet.com> |
+| Tony Vu        | [tvpartytonight](https://github.com/tvpartytonight) | <tv@puppet.com>      |
 | Sarah Thompson | [pinkypie](https://github.com/pinkypie)             | <sarah@puppet.com>   |
+| Fergal Gribben | [ferglor](https://github.com/ferglor)               | <ferglor@puppet.com> |
 
-# Reviewers/Maintainers For Specific Areas of Beaker
+# Reviewers For Specific Areas of Beaker
 
-For code to land in these specific areas of Beaker the following owners must provide review and :+1:
+For code to land in these specific areas of Beaker the following people must provide review and :+1:
 
  Code | Owners
 :-------:|:----------:

data/docs/how_to/hypervisors/openstack.md

@@ -105,4 +105,12 @@ Also if you plan use `user-data` make sure that 'cloud-init' package installed i
       openstack_network : testing
       openstack_keyname : nopass
 
+### Security groups
 
+A security group is a set of rules for incoming and outgoing traffic to 
+an instance.  You can associate a host with one or many security groups
+in the `CONFIG` section of your hosts file:
+
+    security_group: ['my_sg', 'default']
+
+This is an optional config parameter.

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

@@ -1068,12 +1068,11 @@ module Beaker
             opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
             opts[:download_url] = "#{opts[:dev_builds_url]}/puppet-agent/#{ opts[:puppet_agent_sha] || opts[:puppet_agent_version] }/repos/"
             opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
-            opts[:copy_dir_external]  ||= host.external_copy_base
             opts[:puppet_collection] ||= 'PC1'
             add_role(host, 'aio') #we are installing agent, so we want aio role
             release_path = opts[:download_url]
             copy_dir_local = File.join(opts[:copy_base_local], variant)
-            onhost_copy_base = opts[:copy_dir_external]
+            onhost_copy_base = opts[:copy_dir_external] || host.external_copy_base
 
             case variant
             when /^(fedora|el|centos|debian|ubuntu|cumulus|huaweios|cisco_nexus|cisco_ios_xr)$/
@@ -1100,7 +1099,7 @@ module Beaker
             release_path << release_path_end
             logger.trace("#install_puppet_agent_dev_repo_on: dev_package_info, continuing...")
 
-            if host['platform'] =~ /eos/
+            if variant =~ /eos/
               host.get_remote_file( "#{release_path}/#{release_file}" )
             else
               onhost_copied_file = File.join(onhost_copy_base, release_file)

data/lib/beaker/hypervisor.rb

@@ -41,6 +41,8 @@ module Beaker
           end
         when /^vagrant$/
           Beaker::Vagrant
+        when /^vagrant_custom$/
+          Beaker::VagrantCustom
         when /^vagrant_libvirt$/
           Beaker::VagrantLibvirt
         when /^vagrant_virtualbox$/
@@ -147,6 +149,6 @@ module Beaker
   end
 end
 
-[ 'vsphere_helper', 'vagrant', 'vagrant_virtualbox', 'vagrant_parallels', 'vagrant_libvirt', 'vagrant_fusion', 'vagrant_workstation', 'fusion', 'aws_sdk', 'vsphere', 'vmpooler', 'vcloud', 'aixer', 'solaris', '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', 'vmpooler', 'vcloud', 'aixer', 'solaris', 'docker', 'google_compute', 'openstack', 'noop' ].each do |lib|
     require "beaker/hypervisor/#{lib}"
 end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -630,19 +630,21 @@ module Beaker
       @logger.notify("netscaler: nsroot password is #{host['instance'].id}")
     end
 
-    # Set the hostname of all instances to be the hostname defined in the
-    # beaker configuration.
+    # Set the :vmhostname for each host object to be the dns_name, which is accessible
+    # publicly. Then configure each ec2 machine to that dns_name, so that when facter
+    # is installed the facts for hostname and domain match the dns_name.
     #
-    # @return [void]
+    # @return [@hosts]
     # @api private
     def set_hostnames
       @hosts.each do |host|
+        host[:vmhostname] = host[:dns_name]
         if host['platform'] =~ /el-7/
           # on el-7 hosts, the hostname command doesn't "stick" randomly
-          host.exec(Command.new("hostnamectl set-hostname #{host.name}"))
+          host.exec(Command.new("hostnamectl set-hostname #{host.hostname}"))
         else
           next if host['platform'] =~ /netscaler/
-          host.exec(Command.new("hostname #{host.name}"))
+          host.exec(Command.new("hostname #{host.hostname}"))
         end
       end
     end

data/lib/beaker/hypervisor/docker.rb

@@ -192,6 +192,7 @@ module Beaker
         # specify base image
         dockerfile = <<-EOF
           FROM #{host['image']}
+          ENV container docker
         EOF
 
         # additional options to specify to the sshd

data/lib/beaker/hypervisor/openstack.rb

@@ -16,6 +16,7 @@ module Beaker
     #@option options [String] :openstack_region The region that each OpenStack instance should be provisioned on (optional)
     #@option options [String] :openstack_network The network that each OpenStack instance should be contacted through (required)
     #@option options [String] :openstack_keyname The name of an existing key pair that should be auto-loaded onto each
+    #@option options [Hash] :security_group An array of security groups to associate with the instance
     #                                            OpenStack instance (optional)
     #@option options [String] :jenkins_build_url Added as metadata to each OpenStack instance
     #@option options [String] :department Added as metadata to each OpenStack instance
@@ -88,6 +89,18 @@ module Beaker
       @network_client.networks.find { |x| x.name == n } || raise("Couldn't find network: #{n}")
     end
 
+    #Provided an array of security groups return that array if all
+    #security groups are present
+    #@param [Array] sgs The array of security group names
+    #@return [Array] The array of security group names
+    def security_groups sgs
+      for sg in sgs
+        @logger.debug "Openstack: Looking up security group '#{sg}'"
+        @compute_client.security_groups.find { |x| x.name == sg } || raise("Couldn't find security group: #{sg}")
+        sgs
+      end
+    end
+
     # Create a volume client on request
     # @return [Fog::OpenStack::Volume] OpenStack volume client
     def volume_client_create
@@ -102,10 +115,10 @@ module Beaker
       @volume_client ||= Fog::Volume.new(options)
       unless @volume_client
         raise "Unable to create OpenStack Volume instance"\
-              " (api_key: #{@options[:openstack_api_key]},"\
-              " username: #{@options[:openstack_username]},"\
-              " auth_url: #{@options[:openstack_auth_url]},"\
-              " tenant: #{@options[:openstack_tenant]})"
+          " (api_key: #{@options[:openstack_api_key]},"\
+        " username: #{@options[:openstack_username]},"\
+        " auth_url: #{@options[:openstack_auth_url]},"\
+        " tenant: #{@options[:openstack_tenant]})"
       end
     end
 
@@ -158,21 +171,35 @@ module Beaker
       end
     end
 
+    def get_ip
+      ip = @compute_client.addresses.find { |ip| ip.instance_id.nil? }
+      if ip.nil?
+        @logger.debug "Creating IP"
+        ip = @compute_client.addresses.create
+      end
+      ip
+    end
+
+
     #Create new instances in OpenStack
     def provision
       @logger.notify "Provisioning OpenStack"
 
       @hosts.each do |host|
-        host[:vmhostname] = generate_host_name
+        ip = get_ip
+        hostname = ip.ip.gsub! '.','-'
+        host[:vmhostname] = hostname+'.rfc1918.puppetlabs.net'
         @logger.debug "Provisioning #{host.name} (#{host[:vmhostname]})"
         options = {
           :flavor_ref => flavor(host[:flavor]).id,
           :image_ref  => image(host[:image]).id,
           :nics       => [ {'net_id' => network(@options[:openstack_network]).id } ],
           :name       => host[:vmhostname],
+          :hostname   => host[:vmhostname],
           :user_data  => host[:user_data] || "#cloud-config\nmanage_etc_hosts: true\n",
         }
         options[:key_name] = key_name(host)
+        options[:security_groups] = security_groups(@options[:security_group]) unless @options[:security_group].nil?
         vm = @compute_client.servers.create(options)
 
         #wait for the new instance to start up
@@ -204,11 +231,7 @@ module Beaker
         begin
           # Here we try and assign an address from a floating IP pool
           # This seems to fail on some implementations (FloatingIpPoolNotFound)
-          ip = @compute_client.addresses.find { |ip| ip.instance_id.nil? }
-          if ip.nil?
-            @logger.debug "Creating IP for #{host.name} (#{host[:vmhostname]})"
-            ip = @compute_client.addresses.create
-          end
+          ip.ip.gsub! '-','.'
           ip.server = vm
           address = ip.ip
 

data/lib/beaker/hypervisor/vagrant_custom.rb

@@ -0,0 +1,11 @@
+require 'beaker/hypervisor/vagrant'
+
+class Beaker::VagrantCustom < Beaker::Vagrant
+  def provision(provider = nil)
+    super
+  end
+
+  def make_vfile hosts, options = {}
+    FileUtils.cp(@options[:vagrantfile_path], @vagrant_file)
+  end
+end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.50.0'
+    STRING = '2.51.0'
   end
 end

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

@@ -1059,7 +1059,7 @@ describe ClassMixedWithDSLInstallUtils do
       # install_puppetlabs_dev_repo route
       platform = Object.new()
       allow( platform ).to receive( :to_array ) { ['eos', '5', 'x4'] }
-      host = basic_hosts.first
+      host = eoshost
       host['platform'] = platform
       sha_value = 'dahdahdahdah'
       copy_base_local_override = 'face'
@@ -1072,10 +1072,7 @@ describe ClassMixedWithDSLInstallUtils do
 
       allow( host ).to receive( :puppet_agent_dev_package_info ).and_return( ['', ''] )
 
-      expect( subject ).to receive( :fetch_http_file ).once.with(
-        anything, anything, /^#{copy_base_local_override}/ )
-      expect( subject ).to receive( :scp_to ).once.with(
-        host, /#{copy_base_local_override}/, anything )
+      allow( host ).to receive( :get_remote_file).once.with(anything)
       allow( host ).to receive( :install_from_file )
 
       subject.install_puppet_agent_dev_repo_on( host, opts )
@@ -1110,6 +1107,92 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :fetch_http_file ).with( /[^\/]\z/, anything, anything )
       subject.install_puppet_agent_dev_repo_on( host, opts.merge({ :puppet_agent_version => '1.0.0' }) )
     end
+
+    it 'installs on different hosts without erroring' do
+      mhosts = hosts
+      mhosts[3] = eoshost
+
+      mhosts.each_with_index do |host, index|
+        platform = Object.new()
+        if index == 0
+          allow(platform).to receive(:to_array) { ['solaris', '5', 'x4']}
+          allow(host).to receive(:external_copy_base) {'/host0'}
+        elsif index == 1
+          allow(platform).to receive(:to_array) { ['windows', '5', 'x4']}
+          allow(host).to receive(:external_copy_base) {'/host1'}
+        elsif index == 2
+          allow(platform).to receive(:to_array) { ['osx', '5', 'x4']}
+          allow(host).to receive(:external_copy_base) {'/host2'}
+        elsif index == 3
+          allow(platform).to receive(:to_array) { ['eos', '5', 'x4']}
+          allow(host).to receive(:external_copy_base) {'/host3'}
+        end
+        host['platform'] = platform
+        allow(host).to receive(:puppet_agent_dev_package_info).with(any_args).and_return(["test", "blah"])
+      end
+
+      expect( subject ).to receive(:add_role).with( any_args ).exactly(mhosts.length).times
+
+      expect( subject ).to receive(:fetch_http_file).with( any_args ).exactly(3).times
+      expect( subject ).to receive(:scp_to).with( any_args ).exactly(3).times
+
+      expect( subject ).to receive(:install_msi_on).with( mhosts[1], 'xyz', {}, anything).exactly(1).times
+      expect( mhosts[0] ).to receive(:solaris_install_local_package).with( "blah", "/host0" ).exactly(1).times
+      expect( mhosts[2] ).to receive(:install_package).with( any_args ).exactly(1).times
+      expect( mhosts[3] ).to receive(:install_from_file).with( "blah" ).exactly(1).times
+
+      result = object_double(Beaker::Result.new({}, "foo"), :raw_output=> "xyz")
+      allow(subject).to receive(:on).with(mhosts[1], anything).and_return(result)
+
+      expect( subject ).to receive(:configure_type_defaults_on).with( any_args ).exactly(mhosts.length).times
+
+      subject.install_puppet_agent_dev_repo_on( mhosts, opts.merge({:puppet_agent_version => '1.0.0' }) )
+    end
+
+    it 'installs on different hosts with options specifying :copy_dir_external' do
+      mhosts = hosts
+      mhosts[3] = eoshost
+
+      mhosts.each_with_index do |host, index|
+        platform = Object.new()
+        if index == 0
+          allow(platform).to receive(:to_array) { ['solaris', '5', 'x4']}
+          allow(host).to receive(:external_copy_base) {'/host0'}
+        elsif index == 1
+          allow(platform).to receive(:to_array) { ['windows', '5', 'x4']}
+          allow(host).to receive(:external_copy_base) {'/host1'}
+        elsif index == 2
+          allow(platform).to receive(:to_array) { ['osx', '5', 'x4']}
+          allow(host).to receive(:external_copy_base) {'/host2'}
+        elsif index == 3
+          allow(platform).to receive(:to_array) { ['eos', '5', 'x4']}
+          allow(host).to receive(:external_copy_base) {'/host3'}
+        end
+        allow(host).to receive(:puppet_agent_dev_package_info).with(any_args).and_return(["test", "/blah"])
+        host['platform'] = platform
+      end
+
+      expect( subject ).to receive(:add_role).with( any_args ).exactly(mhosts.length).times
+
+      expect( subject ).to receive(:fetch_http_file).with( any_args ).exactly(3).times
+      expect( subject ).to receive(:scp_to).with( any_args ).exactly(3).times
+
+      expect( subject ).to receive(:install_msi_on).with(mhosts[1], 'xyz', {}, anything ).exactly(1).times
+      expect( mhosts[0] ).to receive(:solaris_install_local_package).with( '/blah', '/tmp').exactly(1).times
+      expect( mhosts[2] ).to receive(:install_package).with( any_args ).exactly(1).times
+      expect( mhosts[3] ).to receive(:install_from_file).with( '/blah').exactly(1).times
+      expect( mhosts[0] ).to receive(:external_copy_base).with( no_args ).exactly(0).times
+      expect( mhosts[1] ).to receive(:external_copy_base).with( no_args ).exactly(0).times
+      expect( mhosts[2] ).to receive(:external_copy_base).with( no_args ).exactly(0).times
+      expect( mhosts[3] ).to receive(:external_copy_base).with( no_args ).exactly(0).times
+
+      result = object_double(Beaker::Result.new({}, "foo"), :raw_output=> "xyz")
+      allow(subject).to receive(:on).with(mhosts[1], anything).and_return(result)
+
+      expect( subject ).to receive(:configure_type_defaults_on).with( any_args ).exactly(mhosts.length).times
+
+      subject.install_puppet_agent_dev_repo_on( mhosts, opts.merge({:puppet_agent_version => '1.0.0', :copy_dir_external => '/tmp' }) )
+    end
   end
 
   describe '#install_puppet_agent_pe_promoted_repo_on' do

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -602,7 +602,7 @@ module Beaker
 
       context 'for each host' do
         it 'calls exec' do
-          @hosts.each do |host| 
+          @hosts.each do |host|
             expect(host).to receive(:exec).once unless host['platform'] =~ /netscaler/
           end
           expect(set_hostnames).to eq(@hosts)
@@ -614,6 +614,15 @@ module Beaker
           end
           expect(set_hostnames).to eq(@hosts)
         end
+
+        it 'sets the the vmhostname to the dns_name for each host' do
+          expect(set_hostnames).to eq(@hosts)
+          @hosts.each do |host|
+            expect(host[:vmhostname]).to eq(host[:dns_name])
+            expect(host[:vmhostname]).to eq(host.hostname)
+          end
+        end
+
       end
     end
 

data/spec/beaker/hypervisor/docker_spec.rb

@@ -387,6 +387,17 @@ module Beaker
         expect { docker.send(:dockerfile_for, {'platform' => 'centos-7-x86_64'})}.to raise_error(/Docker image undefined/)
       end
 
+      it 'should set "ENV container docker"' do
+        FakeFS.deactivate!
+        platforms.each do |platform|
+          dockerfile = docker.send(:dockerfile_for, {
+            'platform' => platform,
+            'image' => 'foobar',
+          })
+          expect( dockerfile ).to be =~ /ENV container docker/
+        end
+      end
+
       it 'should add docker_image_commands as RUN statements' do
         FakeFS.deactivate!
         platforms.each do |platform|

data/spec/beaker/hypervisor/openstack_spec.rb

@@ -28,6 +28,7 @@ module Beaker
       expect(options['openstack_tenant']).to eq('testing')
       expect(options['openstack_network']).to eq('testing')
       expect(options['openstack_keyname']).to eq('nopass')
+      expect(options['security_group']).to eq(['my_sg', 'default'])
     end
 
     it 'check hosts options during initialization' do
@@ -53,6 +54,7 @@ module Beaker
 
       mock_servers = double().as_null_object
       allow( @compute_client ).to receive( :servers ).and_return( mock_servers )
+
       expect(mock_servers).to receive(:create).with(hash_including(
         :user_data => '#cloud-config\nmanage_etc_hosts: true\nfinal_message: "The host is finally up!"',
         :flavor_ref => 12345,

data/spec/beaker/hypervisor/vagrant_custom_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Beaker::VagrantCustom do
+  let( :options ) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double().as_null_object }) }
+  let( :vagrant ) { Beaker::VagrantCustom.new( @hosts, options ) }
+
+  let(:test_dir) { 'tmp/tests' }
+  let(:custom_vagrant_file_path)  { File.expand_path(test_dir + '/CustomVagrantfile')   }
+
+  before :each do
+    @hosts = make_hosts()
+  end
+
+  it "uses the vagrant_custom provider for provisioning" do
+    @hosts.each do |host|
+      host_prev_name = host['user']
+      expect( vagrant ).to receive( :set_ssh_config ).with( host, 'vagrant' ).once
+      expect( vagrant ).to receive( :copy_ssh_to_root ).with( host, options ).once
+      expect( vagrant ).to receive( :set_ssh_config ).with( host, host_prev_name ).once
+    end
+    expect( vagrant ).to receive( :hack_etc_hosts ).with( @hosts, options ).once
+    FakeFS.activate!
+    expect( vagrant ).to receive( :vagrant_cmd ).with( "up" ).once
+    vagrant.provision
+  end
+
+  context 'takes vagrant configuration from existing file' do
+    it 'writes the vagrant file to the correct location' do
+      options.merge!({ :vagrantfile_path => custom_vagrant_file_path })
+
+      create_files([custom_vagrant_file_path])
+
+      vagrant_file_contents = <<-EOF
+FOO
+      EOF
+      File.open(custom_vagrant_file_path, 'w') { |file| file.write(vagrant_file_contents) }
+
+      vagrant_copy_location = "#{test_dir}/NewVagrantLocation"
+      vagrant.instance_variable_set(:@vagrant_file, vagrant_copy_location)
+      vagrant.make_vfile(@hosts, options)
+      vagrant_copy_file = File.open(vagrant_copy_location, 'r')
+      expect(vagrant_copy_file.read).to be === vagrant_file_contents
+    end
+
+  end
+end

data/spec/helpers.rb

@@ -69,7 +69,8 @@ module HostHelpers
                                                :openstack_auth_url => "http://openstack_hypervisor.labs.net:5000/v2.0/tokens",
                                                :openstack_tenant => "testing",
                                                :openstack_network => "testing",
-                                               :openstack_keyname => "nopass" } )
+                                               :openstack_keyname => "nopass", 
+                                               :security_group => ['my_sg', 'default'] } )
   end
 
   def generate_result (name, opts )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.50.0
+  version: 2.51.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -465,6 +465,7 @@ files:
 - Gemfile
 - HISTORY.md
 - LICENSE
+- MAINTAINERS
 - MAINTAINERS.md
 - README.md
 - Rakefile
@@ -695,6 +696,7 @@ files:
 - lib/beaker/hypervisor/openstack.rb
 - lib/beaker/hypervisor/solaris.rb
 - lib/beaker/hypervisor/vagrant.rb
+- lib/beaker/hypervisor/vagrant_custom.rb
 - lib/beaker/hypervisor/vagrant_fusion.rb
 - lib/beaker/hypervisor/vagrant_libvirt.rb
 - lib/beaker/hypervisor/vagrant_parallels.rb
@@ -784,6 +786,7 @@ files:
 - spec/beaker/hypervisor/hypervisor_spec.rb.orig
 - spec/beaker/hypervisor/openstack_spec.rb
 - spec/beaker/hypervisor/solaris_spec.rb
+- spec/beaker/hypervisor/vagrant_custom_spec.rb
 - spec/beaker/hypervisor/vagrant_fusion_spec.rb
 - spec/beaker/hypervisor/vagrant_libvirt_spec.rb
 - spec/beaker/hypervisor/vagrant_parallels_spec.rb