diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-12-15 12:50:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-15 12:50:46 -0800 |
| commit | cbabef7ea2f197a7e7b9b8a238ad2388d3570a2c (patch) | |
| tree | 0e8a795efada082e49a4e0a145c852f1e34ed253 /kitchen-tests | |
| parent | 731a3a82fe95324f5f9eb9791ef8d2ad54b52beb (diff) | |
| parent | ace946260f63d218462a981831453f76021902c7 (diff) | |
| download | chef-cbabef7ea2f197a7e7b9b8a238ad2388d3570a2c.tar.gz | |
Merge pull request #6673 from chef/shain/move_git_and_docker_cookbook_tests
Move docker and git top cookbook tests to travis
Diffstat (limited to 'kitchen-tests')
| -rw-r--r-- | kitchen-tests/Berksfile.lock | 4 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/base/metadata.rb | 2 | ||||
| -rw-r--r-- | kitchen-tests/cookbooks/base/recipes/default.rb | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock index a674d706d6..815567bc1a 100644 --- a/kitchen-tests/Berksfile.lock +++ b/kitchen-tests/Berksfile.lock @@ -7,7 +7,9 @@ GRAPH base (0.1.0) apt (>= 0.0.0) build-essential (>= 0.0.0) + chef-apt-docker (>= 0.0.0) chef-client (>= 0.0.0) + chef-yum-docker (>= 0.0.0) chef_hostname (>= 0.0.0) cron (>= 0.0.0) git (>= 0.0.0) @@ -24,10 +26,12 @@ GRAPH build-essential (8.0.4) mingw (>= 1.1) seven_zip (>= 0.0.0) + chef-apt-docker (2.0.4) chef-client (9.0.2) cron (>= 4.2.0) logrotate (>= 1.9.0) windows (>= 2.0.0) + chef-yum-docker (3.1.0) chef_hostname (0.6.1) compat_resource (12.19.0) cron (5.0.1) 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" |