From ace946260f63d218462a981831453f76021902c7 Mon Sep 17 00:00:00 2001
From: Scott Hain <shain@chef.io>
Date: Thu, 14 Dec 2017 16:57:31 -0800
Subject: Move git and docker setup top cookbook tests to travis.

Signed-off-by: Scott Hain <shain@chef.io>
---
 .../acceptance-cookbook/libraries/top_cookbooks.rb          |  7 +------
 acceptance/top-cookbooks/.kitchen.docker.yml                | 13 -------------
 acceptance/top-cookbooks/.kitchen.git.yml                   | 11 -----------
 kitchen-tests/Berksfile.lock                                |  4 ++++
 kitchen-tests/cookbooks/base/metadata.rb                    |  2 ++
 kitchen-tests/cookbooks/base/recipes/default.rb             |  3 +++
 6 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100644 acceptance/top-cookbooks/.kitchen.docker.yml
 delete mode 100644 acceptance/top-cookbooks/.kitchen.git.yml

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 5716b97737..dec292567c 100644
--- a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
+++ b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
@@ -6,12 +6,7 @@ class TopCookbooks < Chef::Resource
   # Disabling all windows tests until winrm issue is properly settled.
   #
   action :run do
-    cookbook_kitchen "#{command} docker" do
-    end
-
-    cookbook_kitchen "#{command} git" do
-    end
-
+  
     # FIXME: waiting for https://github.com/learn-chef/learn-chef-acceptance/pull/23
     # cookbook_kitchen "#{command} learn-the-basics-ubuntu" do
     #   repository "learn-chef/learn-chef-acceptance"
diff --git a/acceptance/top-cookbooks/.kitchen.docker.yml b/acceptance/top-cookbooks/.kitchen.docker.yml
deleted file mode 100644
index 505504268f..0000000000
--- a/acceptance/top-cookbooks/.kitchen.docker.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-suites:
-  - name: docker-default
-    attributes:
-      apt-docker:
-        repos:
-          docker-main:
-            keyserver: hkp://ha.pool.sks-keyservers.net
-      docker:
-        version: 1.10.0
-    run_list:
-      - recipe[apt]
-      - recipe[chef-apt-docker]
-    includes: [ubuntu-14.04]
diff --git a/acceptance/top-cookbooks/.kitchen.git.yml b/acceptance/top-cookbooks/.kitchen.git.yml
deleted file mode 100644
index 302657dffc..0000000000
--- a/acceptance/top-cookbooks/.kitchen.git.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-suites:
-  - name: git-default
-    # Ubuntu images need to run apt update
-    run_list: ["recipe[apt]","recipe[git]"]
-    includes: [ubuntu-14.04]
-  - name: git-source
-    run_list: ["recipe[git::source]"]
-    includes: [nonexistent]
-  - name: git-default-windows
-    run_list: ["recipe[git]"]
-    includes: [windows-2012r2]
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index a59de006ed..ca16760c0f 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"
 
-- 
cgit v1.2.1