diff options
author | Serdar Sutay <serdar@opscode.com> | 2014-11-17 14:44:40 -0800 |
---|---|---|
committer | Serdar Sutay <serdar@opscode.com> | 2014-11-17 14:44:40 -0800 |
commit | 4c2cdddd2df165df63408ce7c4cb5953ca1f52c1 (patch) | |
tree | a87fd04ce3b740db19418b51444543b9a12b5dfe | |
parent | cabad557588dcdb62c8bcca796bbe543b7b93214 (diff) | |
download | chef-4c2cdddd2df165df63408ce7c4cb5953ca1f52c1.tar.gz |
Move the dev-repo cookbooks to kitchen-tests directory based on PR comments.
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | dev-repo/README.md | 22 | ||||
-rw-r--r-- | dev-repo/dev-config.rb | 2 | ||||
-rw-r--r-- | dev-repo/nodes/chef-ubuntu-1210.vagrantup.com.json | 3 | ||||
-rw-r--r-- | kitchen-tests/.chef/client.rb | 9 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/audit_test/.gitignore (renamed from dev-repo/cookbooks/audit_test/.gitignore) | 0 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/audit_test/.kitchen.yml (renamed from dev-repo/cookbooks/audit_test/.kitchen.yml) | 0 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/audit_test/Berksfile (renamed from dev-repo/cookbooks/audit_test/Berksfile) | 0 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/audit_test/README.md (renamed from dev-repo/cookbooks/audit_test/README.md) | 0 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/audit_test/chefignore (renamed from dev-repo/cookbooks/audit_test/chefignore) | 0 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/audit_test/metadata.rb (renamed from dev-repo/cookbooks/audit_test/metadata.rb) | 0 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/audit_test/recipes/default.rb (renamed from dev-repo/cookbooks/audit_test/recipes/default.rb) | 0 |
12 files changed, 7 insertions, 33 deletions
diff --git a/.gitignore b/.gitignore index 30a3bd6531..ecba9f4030 100644 --- a/.gitignore +++ b/.gitignore @@ -39,5 +39,5 @@ Berksfile.lock Vagrantfile .vagrant/ -# Dev Repo Local Mode Data -dev-repo/nodes/* +# Kitchen Tests Local Mode Data +kitchen-tests/nodes/* diff --git a/dev-repo/README.md b/dev-repo/README.md deleted file mode 100644 index fc29aa0d3f..0000000000 --- a/dev-repo/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# Chef Developer Repo - -This repository contains some basic cookbooks to test chef while you're hacking away. - -You can run these recipes on your box with: - -``` -$ bundle install -$ bundle exec chef-client -z -o "recipe[audit_test::default]" -c dev-repo/dev-config.rb -``` - -Or you can provision a VM using the kitchen configuration and run these tests: - -``` -$ kitchen converge chef-ubuntu-1210 -$ kitchen login chef-ubuntu-1210 -$ export PATH=/opt/chef/bin:/opt/chef/embedded/bin:$PATH -$ cd ~/chef -$ bundle install -$ bundle exec chef-client -z -o "recipe[audit_test::default]" -c dev-repo/dev-config.rb - -``` diff --git a/dev-repo/dev-config.rb b/dev-repo/dev-config.rb deleted file mode 100644 index 11360e9d93..0000000000 --- a/dev-repo/dev-config.rb +++ /dev/null @@ -1,2 +0,0 @@ -cookbook_path File.join(File.expand_path(File.dirname(__FILE__)), "cookbooks") -cache_path "#{ENV['HOME']}/.cache/chef" diff --git a/dev-repo/nodes/chef-ubuntu-1210.vagrantup.com.json b/dev-repo/nodes/chef-ubuntu-1210.vagrantup.com.json deleted file mode 100644 index 17e7b8d173..0000000000 --- a/dev-repo/nodes/chef-ubuntu-1210.vagrantup.com.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "chef-ubuntu-1210.vagrantup.com" -}
\ No newline at end of file diff --git a/kitchen-tests/.chef/client.rb b/kitchen-tests/.chef/client.rb index 5eb200a939..98f773d691 100644 --- a/kitchen-tests/.chef/client.rb +++ b/kitchen-tests/.chef/client.rb @@ -1,7 +1,8 @@ -chef_dir = File.expand_path(File.dirame(__FILE__)) -repo_dir = File.expand_path(Fild.join(chef_dir, '..')) +chef_dir = File.expand_path(File.dirname(__FILE__)) +repo_dir = File.expand_path(File.join(chef_dir, '..')) -log_level :info +log_level :info chef_repo_path repo_dir -local_mode true +local_mode true +cache_path "#{ENV['HOME']}/.cache/chef" diff --git a/dev-repo/cookbooks/audit_test/.gitignore b/kitchen-tests/cookbooks/audit_test/.gitignore index ec2a890bd3..ec2a890bd3 100644 --- a/dev-repo/cookbooks/audit_test/.gitignore +++ b/kitchen-tests/cookbooks/audit_test/.gitignore diff --git a/dev-repo/cookbooks/audit_test/.kitchen.yml b/kitchen-tests/cookbooks/audit_test/.kitchen.yml index 3775752da2..3775752da2 100644 --- a/dev-repo/cookbooks/audit_test/.kitchen.yml +++ b/kitchen-tests/cookbooks/audit_test/.kitchen.yml diff --git a/dev-repo/cookbooks/audit_test/Berksfile b/kitchen-tests/cookbooks/audit_test/Berksfile index 0ac9b78cf7..0ac9b78cf7 100644 --- a/dev-repo/cookbooks/audit_test/Berksfile +++ b/kitchen-tests/cookbooks/audit_test/Berksfile diff --git a/dev-repo/cookbooks/audit_test/README.md b/kitchen-tests/cookbooks/audit_test/README.md index 31fb97a12d..31fb97a12d 100644 --- a/dev-repo/cookbooks/audit_test/README.md +++ b/kitchen-tests/cookbooks/audit_test/README.md diff --git a/dev-repo/cookbooks/audit_test/chefignore b/kitchen-tests/cookbooks/audit_test/chefignore index 80dc2d20ef..80dc2d20ef 100644 --- a/dev-repo/cookbooks/audit_test/chefignore +++ b/kitchen-tests/cookbooks/audit_test/chefignore diff --git a/dev-repo/cookbooks/audit_test/metadata.rb b/kitchen-tests/cookbooks/audit_test/metadata.rb index 4a60104e92..4a60104e92 100644 --- a/dev-repo/cookbooks/audit_test/metadata.rb +++ b/kitchen-tests/cookbooks/audit_test/metadata.rb diff --git a/dev-repo/cookbooks/audit_test/recipes/default.rb b/kitchen-tests/cookbooks/audit_test/recipes/default.rb index f02f24c2c9..f02f24c2c9 100644 --- a/dev-repo/cookbooks/audit_test/recipes/default.rb +++ b/kitchen-tests/cookbooks/audit_test/recipes/default.rb |