Skip to content

Commit 36a40e3

Browse files
committed
Fully migrated to test-kitchen 1.alpha and vagrant 1.1.x/berkshelf 1.3.1
1 parent e6ce82c commit 36a40e3

File tree

4 files changed

+13
-17
lines changed

4 files changed

+13
-17
lines changed

.kitchen.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ platforms:
99
driver_config:
1010
box: opscode-ubuntu-12.04
1111
box_url: https://opscode-vm.s3.amazonaws.com/vagrant/boxes/opscode-ubuntu-12.04.box
12+
require_chef_omnibus: 11.4.0
1213
run_list:
1314
- recipe[apt]
1415
- name: ubuntu-10.04
@@ -32,6 +33,12 @@ suites:
3233
attributes:
3334
nodejs:
3435
install_method: package
36+
- name: binary
37+
run_list:
38+
- recipe[nodejs]
39+
attributes:
40+
nodejs:
41+
install_method: binary
3542
- name: source
3643
run_list:
3744
- recipe[nodejs]

Berksfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
site :opscode
2+
metadata
3+
14
cookbook 'apt', '~> 1.7.0'
25
cookbook 'build-essential'
3-
cookbook 'nodejs', :path => '.'

Gemfile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
source 'https://rubygems.org'
22

33
gem 'foodcritic'
4-
gem 'berkshelf'
54
gem 'thor-foodcritic'
6-
gem 'vagrant', '~> 1.0.6'
75

86
group :integration do
9-
gem 'test-kitchen', :git => "git://github.com/opscode/test-kitchen.git", :branch => '1.0'
10-
gem 'kitchen-vagrant', :git => "git://github.com/opscode/kitchen-vagrant.git"
11-
12-
# Change .kitchen.yml's driver_plugin to ec2 and populate
13-
# .kitchen.local.yml's driver_config with aws auth data
14-
gem 'kitchen-ec2', :git => "git://github.com/opscode/kitchen-ec2.git"
7+
gem 'berkshelf', '~> 1.3.1'
8+
gem 'test-kitchen', '~> 1.0.0.alpha.1'
9+
gem 'kitchen-vagrant', '~> 0.7.2'
1510
end

Vagrantfile

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)