Merge pull request #35 from rightscale-cookbooks/white_14_02_acu15227…

…1_upgrade_vagrant_on_CI

Upgrade to a newer version of Vagrant which allows for multiple VM instances to be run

attributes/vagrant.rb

@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-default['rs-cookbooks_ci']['vagrant']['url'] = 'http://files.vagrantup.com/packages/a40522f5fabccb9ddabad03d836e120ff5d14093/vagrant_1.3.5_x86_64.deb'
-default['rs-cookbooks_ci']['vagrant']['checksum'] = 'db7d06f46e801523d97b6e344ea0e4fe942f630cc20ab1706e4c996872f8cd71'
-
-default['rs-cookbooks_ci']['vagrant']['plugins'] = ['vagrant-berkshelf', 'vagrant-omnibus', 'bindler']
+default['rs-cookbooks_ci']['vagrant']['url'] = 'https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_x86_64.deb'
+default['rs-cookbooks_ci']['vagrant']['checksum'] = 'dbd06de0f3560e2d046448d627bca0cbb0ee34b036ef605aa87ed20e6ad2684b'
+default['rs-cookbooks_ci']['vagrant']['plugins'] = []

metadata.rb

@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs/Configures rs-cookbooks_ci'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.2'
+version          '0.2.3'
 
 supports "ubuntu"
 
@@ -15,7 +15,7 @@
 depends "line", "~> 0.5.1"
 depends "jenkins", "~> 1.2.0"
 depends "vagrant", "~> 0.2.0"
-depends "virtualbox", "~> 1.0.0"
+depends "virtualbox", "~> 1.0.2"
 depends "git", "~> 2.7.0"
 
 recipe "rs-cookbooks_ci::default",

templates/default/job_config_pr.xml.erb

@@ -33,9 +33,6 @@
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers>
-    <com.cloudbees.jenkins.GitHubPushTrigger plugin="[email protected]">
-      <spec></spec>
-    </com.cloudbees.jenkins.GitHubPushTrigger>
     <org.jenkinsci.plugins.ghprb.GhprbTrigger plugin="[email protected]">
       <spec></spec>
       <adminlist><%= @job_admins_list %></adminlist>

test/integration/default/bats/default.bats

@@ -7,27 +7,13 @@
 }
 
 @test "Check that the correct version for vagrant is installed" {
-  vagrant --version | grep '1\.3\.5'
+  vagrant --version | grep '1\.4\.3'
 }
 
 @test "Check that the correct version of virtualbox is installed" {
   vboxmanage --version | grep '^4\.3'
 }
 
-# Check that the following vagrant plugins are installed: vagrant-berkshelf, vagrant-omnibus, bindler
-
-@test "Check that the vagrant-berkshelf plugin is installed" {
-  sudo -i -u jenkins vagrant plugin list | grep vagrant-berkshelf
-}
-
-@test "Check that the vagrant-omnibus plugin is installed" {
-  sudo -i -u jenkins vagrant plugin list | grep vagrant-omnibus
-}
-
-@test "Check that the bindler plugin is installed" {
-  sudo -i -u jenkins vagrant plugin list | grep bindler
-}
-
 # Check that Ruby v1.9.3 is installed
 
 @test "Check that Ruby is installed" {