summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKartik Null Cating-Subramanian <ksubramanian@chef.io>2016-01-08 14:19:36 -0800
committerKartik Null Cating-Subramanian <ksubramanian@chef.io>2016-01-11 16:10:38 -0500
commite16f877cec3bfa864aafcc0c85e168755e030d5d (patch)
treeddd9596e8066d71d6d0f194db4b0b8627cd36ee6
parent69318b7e7f3dd3c2e4dd76da6e2d5eb774cc3762 (diff)
downloadchef-e16f877cec3bfa864aafcc0c85e168755e030d5d.tar.gz
Update kitchen.yml to look in the right place
-rw-r--r--omnibus/.kitchen.local.yml.vmware.example4
-rw-r--r--omnibus/.kitchen.yml25
2 files changed, 9 insertions, 20 deletions
diff --git a/omnibus/.kitchen.local.yml.vmware.example b/omnibus/.kitchen.local.yml.vmware.example
index c165fc4da4..69f001ef97 100644
--- a/omnibus/.kitchen.local.yml.vmware.example
+++ b/omnibus/.kitchen.local.yml.vmware.example
@@ -2,5 +2,5 @@ driver:
name: vagrant
provider: vmware_fusion
customize:
- numvcpus: 2
- memsize: 2048
+ numvcpus: 4
+ memsize: 4096
diff --git a/omnibus/.kitchen.yml b/omnibus/.kitchen.yml
index 6139599685..844ae9d895 100644
--- a/omnibus/.kitchen.yml
+++ b/omnibus/.kitchen.yml
@@ -11,13 +11,16 @@ driver:
cpus: 4
memory: 4096
synced_folders:
- - ['.', '/home/vagrant/omnibus-chef']
- - ['../omnibus', '/home/vagrant/omnibus']
- - ['../omnibus-software', '/home/vagrant/omnibus-software']
+ - ['..', '/home/vagrant/chef']
+ - ['../../omnibus', '/home/vagrant/omnibus']
+ - ['../../omnibus-software', '/home/vagrant/omnibus-software']
provisioner:
name: chef_zero
- require_chef_omnibus: true # Always install the latest version of Chef
+ # Always install the latest version of Chef.
+ # This is not the version of chef that we're building - this is the version
+ # of chef that omnibus needs to build chef/chef.
+ require_chef_omnibus: true
platforms:
- name: centos-5.10
@@ -106,17 +109,3 @@ suites:
install_dir: /opt/chef
run_list:
- omnibus::default
- - name: chefdk
- attributes:
- omnibus:
- <<: *attribute_defaults
- install_dir: /opt/chefdk
- run_list:
- - omnibus::default
- - name: push-jobs-client
- attributes:
- omnibus:
- <<: *attribute_defaults
- install_dir: /opt/push-jobs-client
- run_list:
- - omnibus::default