diff options
| author | Matt Wrock <matt@mattwrock.com> | 2016-03-04 16:59:38 -0800 |
|---|---|---|
| committer | Matt Wrock <matt@mattwrock.com> | 2016-03-04 16:59:38 -0800 |
| commit | 60c8124366ab34b5992fc03c508b345218c90dfe (patch) | |
| tree | ad4d91f01d466e56979bf6a1b885592c4b0ff749 | |
| parent | 447bbd07485125aefa0cd14c84d4cbed0b010696 (diff) | |
| parent | 0f93656abca13009a728aafe908350fc3522c931 (diff) | |
| download | chef-60c8124366ab34b5992fc03c508b345218c90dfe.tar.gz | |
Merge pull request #4667 from chef/accept_docker
adding docker to top_cookbooks
| -rw-r--r-- | acceptance/.gitignore | 1 | ||||
| -rw-r--r-- | acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb | 3 | ||||
| -rw-r--r-- | acceptance/top-cookbooks/.kitchen.docker.yml | 12 |
3 files changed, 16 insertions, 0 deletions
diff --git a/acceptance/.gitignore b/acceptance/.gitignore index 66f8ed35a4..0d2aa76a44 100644 --- a/acceptance/.gitignore +++ b/acceptance/.gitignore @@ -1 +1,2 @@ /Gemfile.lock +.acceptance_logs diff --git a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb index aed81f073b..3098b334ce 100644 --- a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb +++ b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb @@ -4,6 +4,9 @@ class TopCookbooks < Chef::Resource property :command, String, name_property: true action :run do + cookbook_kitchen "#{command} docker" do + end + cookbook_kitchen "#{command} git" do end diff --git a/acceptance/top-cookbooks/.kitchen.docker.yml b/acceptance/top-cookbooks/.kitchen.docker.yml new file mode 100644 index 0000000000..74a238495a --- /dev/null +++ b/acceptance/top-cookbooks/.kitchen.docker.yml @@ -0,0 +1,12 @@ +suites: + - name: docker-default + attributes: + docker: + version: 1.10.0 + run_list: + - recipe[apt] + - recipe[apt-docker] + - recipe[docker_test::installation_package] + - recipe[docker_test::service_upstart] + - recipe[docker_test::auto] + includes: [ubuntu-14.04] |