diff options
| author | Scott Hain <shain@chef.io> | 2017-12-14 16:57:31 -0800 |
|---|---|---|
| committer | Scott Hain <shain@chef.io> | 2017-12-15 10:47:53 -0800 |
| commit | ace946260f63d218462a981831453f76021902c7 (patch) | |
| tree | 7e3a1984bfd647eaaa88988547c95a75e5f6c0a6 /kitchen-tests/cookbooks | |
| parent | 8c9cc06ee3d0a8abe4984a88882211e63fd86b75 (diff) | |
| download | chef-ace946260f63d218462a981831453f76021902c7.tar.gz | |
Move git and docker setup top cookbook tests to travis.shain/move_git_and_docker_cookbook_tests
Signed-off-by: Scott Hain <shain@chef.io>
Diffstat (limited to 'kitchen-tests/cookbooks')
| -rw-r--r-- | kitchen-tests/cookbooks/base/metadata.rb | 2 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/base/recipes/default.rb | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/kitchen-tests/cookbooks/base/metadata.rb b/kitchen-tests/cookbooks/base/metadata.rb index 9ad79ec0aa..9d4e663bec 100644 --- a/kitchen-tests/cookbooks/base/metadata.rb +++ b/kitchen-tests/cookbooks/base/metadata.rb @@ -10,7 +10,9 @@ gem "chef-sugar" depends "apt" depends "build-essential" +depends "chef-apt-docker" depends "chef-client" +depends "chef-yum-docker" depends "chef_hostname" depends "logrotate" depends "multipackage" diff --git a/kitchen-tests/cookbooks/base/recipes/default.rb b/kitchen-tests/cookbooks/base/recipes/default.rb index e8b231b162..8b0eac0e6e 100644 --- a/kitchen-tests/cookbooks/base/recipes/default.rb +++ b/kitchen-tests/cookbooks/base/recipes/default.rb @@ -44,6 +44,9 @@ include_recipe "chef-client::delete_validation" include_recipe "chef-client::config" include_recipe "chef-client" +include_recipe "chef-apt-docker" +include_recipe "chef-yum-docker" + # hack needed for debian-7 on docker directory "/var/run/sshd" |