beaker-vagrant 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad7a48a926a8e35cd1b59384402d8dd8d6cd833b
-  data.tar.gz: a78eb144ba8bfe0b1096fc37247050944e5eca2f
+  metadata.gz: be5bca0523dc11ccbf64ec70bb412249c0f066ac
+  data.tar.gz: 42598743132e53abaaf332f544314af3e2679246
 SHA512:
-  metadata.gz: 20d51507ba20ccf305ef457eb444b14c61441d9ff25314612e61ab7a4cee68e409b5790c3a0aca82a443ee0a3decbdd1f01332b514b7400aae8f0b393c31cffd
-  data.tar.gz: efc33b0bf519fb99f3b51c184201d8bdd3439e4139c49078c331a780f4803a2638e6918d308c1cddaccde4249b1ba74b82158751d9e109c0d71358d47d535e46
+  metadata.gz: f4b5d2b30e983d9c6e76c550ca0fc83c34416589f2aa35cd0096897d39d54560d0a4edb7fce58b878e56e1ab5c8cf043198a4819b40b77a13aed3920bdf80188
+  data.tar.gz: 731c1ba2c3ded6af01c86397e0e850f0832857b53071dd194f963f29c18870ae02805438752677f3fbe805a58ff0d7eb99b13bf1d45705495f2c37eccfd42893

data/lib/beaker-vagrant/version.rb

@@ -1,3 +1,3 @@
 module BeakerVagrant
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/lib/beaker/hypervisor/vagrant.rb

@@ -102,6 +102,7 @@ module Beaker
           v_file << "    v.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true\n"
           v_file << "    v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true\n"
           v_file << "    v.vm.guest = :windows\n"
+          v_file << "    v.vm.communicator = 'winrm'\n"
         end
 
         if /osx/i.match(host['platform'])
@@ -166,6 +167,14 @@ module Beaker
         host.close
 
         set_ssh_config host, default_user
+
+        #allow the user to set the env
+        begin
+          host.ssh_permit_user_environment
+          host.close
+        rescue ArgumentError => e
+          @logger.debug("Failed to set SshPermitUserEnvironment. #{e}")
+        end
       end
 
       hack_etc_hosts @hosts, @options
@@ -239,6 +248,7 @@ module Beaker
 
         set_all_ssh_config
       end
+      super
     end
 
     def provision(provider = nil)

data/lib/beaker/hypervisor/vagrant_virtualbox.rb

@@ -25,9 +25,10 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
 
   def self.provider_vfile_section(host, options)
     # Allow memory and CPUs to be set at a per node level or overall, and take the most specific setting
+    # Removing audio is a workaround of a virtualbox bug that gives error message : "The specified string / bytes buffer was to small"
     provider_section  = ""
     provider_section << "    v.vm.provider :virtualbox do |vb|\n"
-    provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{memsize(host,options)}', '--cpus', '#{cpus(host,options)}']\n"
+    provider_section << "      vb.customize ['modifyvm', :id, '--memory', '#{memsize(host,options)}', '--cpus', '#{cpus(host,options)}', '--audio', 'none']\n"
     provider_section << "      vb.vbguest.auto_update = false" if options[:vbguest_plugin] == 'disable'
 
     # Guest volume support

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -1,3 +1,4 @@
+require 'beaker/platform'
 require 'spec_helper'
 
 module Beaker
@@ -23,7 +24,8 @@ module Beaker
           :http => {:from => 10080, :to => 80},
           :ssl  => {:from => 4443,  :to => 443},
           :tomcat => {:from => 8080, :to => 8080}
-        }
+        },
+        :platform => Beaker::Platform.new('centos-8-x86_64')
       })
     end
 
@@ -58,7 +60,7 @@ Vagrant.configure("2") do |c|
     v.vm.network :forwarded_port, guest: 443, host: 4443
     v.vm.network :forwarded_port, guest: 8080, host: 8080
     v.vm.provider :virtualbox do |vb|
-      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']
+      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none']
     end
   end
   c.vm.define 'vm2' do |v|
@@ -73,7 +75,7 @@ Vagrant.configure("2") do |c|
     v.vm.network :forwarded_port, guest: 443, host: 4443
     v.vm.network :forwarded_port, guest: 8080, host: 8080
     v.vm.provider :virtualbox do |vb|
-      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']
+      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none']
     end
   end
   c.vm.define 'vm3' do |v|
@@ -88,7 +90,7 @@ Vagrant.configure("2") do |c|
     v.vm.network :forwarded_port, guest: 443, host: 4443
     v.vm.network :forwarded_port, guest: 8080, host: 8080
     v.vm.provider :virtualbox do |vb|
-      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']
+      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none']
     end
   end
 end
@@ -256,6 +258,10 @@ EOF
         expect( @generated_file ).to match /v.vm.guest = :windows/
       end
 
+      it 'configures the guest type to use winrm' do
+        expect( @generated_file ).to match /v.vm.communicator = 'winrm'/
+      end
+
       it 'sets a non-default memsize' do
         expect( @generated_file ).to match /'--memory', '2048',/
       end
@@ -293,7 +299,7 @@ EOF
 
       generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
 
-      match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', 'hello!', '--cpus', '1'\]/)
+      match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', 'hello!', '--cpus', '1', '--audio', 'none'\]/)
 
       expect( match ).to_not be nil
 
@@ -307,7 +313,7 @@ EOF
 
       generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
 
-      match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', '1024', '--cpus', 'goodbye!'\]/)
+      match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', '1024', '--cpus', 'goodbye!', '--audio', 'none'\]/)
 
       expect( match ).to_not be nil
 
@@ -634,10 +640,11 @@ EOF
       before :each do
         expect( vagrant ).to receive( :vagrant_cmd ).with( "up" ).once
         @hosts.each do |host|
+          host[:platform] = 'windows'
           host_prev_name = host['user']
-          expect( vagrant ).to receive( :set_ssh_config ).with( host, 'vagrant' ).once
-          expect( vagrant ).not_to receive( :copy_ssh_to_root ).with( host, options ).once
-          expect( vagrant ).not_to receive( :set_ssh_config ).with( host, host_prev_name ).once
+          expect( vagrant ).not_to receive( :set_ssh_config ).with( host, 'vagrant' )
+          expect( vagrant ).not_to receive( :copy_ssh_to_root ).with( host, options )
+          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
       end

data/spec/beaker/hypervisor/vagrant_virtualbox_spec.rb

@@ -27,7 +27,7 @@ describe Beaker::VagrantVirtualbox do
     vagrant.make_vfile( @hosts )
 
     vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include( %Q{    v.vm.provider :virtualbox do |vb|\n      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']\n    end})
+    expect( vagrantfile ).to include( %Q{    v.vm.provider :virtualbox do |vb|\n      vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none']\n    end})
   end
 
   it "can disable the vb guest plugin" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec