summaryrefslogtreecommitdiff
path: root/acceptance
diff options
context:
space:
mode:
Diffstat (limited to 'acceptance')
-rw-r--r--acceptance/.gitignore1
-rw-r--r--acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb3
-rw-r--r--acceptance/top-cookbooks/.kitchen.docker.yml12
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]