diff options
| author | Scott Hain <shain@chef.io> | 2017-12-15 13:58:45 -0800 |
|---|---|---|
| committer | Scott Hain <shain@chef.io> | 2017-12-15 13:58:45 -0800 |
| commit | fe8edb308dac2e2fa9b8b917f88442e0acae7615 (patch) | |
| tree | e6d2ef1bed5730accf0b34b89cbd881adcb4160e | |
| parent | 9261e4726472ae5aad969336c7903600afe5a624 (diff) | |
| download | chef-shain/backport_git_docker_tests.tar.gz | |
Backport 6673 to chef-12 branchshain/backport_git_docker_tests
Signed-off-by: Scott Hain <shain@chef.io>
5 files changed, 5 insertions, 26 deletions
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 73f5151bca..0f533ed8e0 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,6 @@ 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 - cookbook_kitchen "#{command} learn-the-basics-ubuntu" do repository "learn-chef/learn-chef-acceptance" cookbook_relative_dir "cookbooks/learn-the-basics-ubuntu" diff --git a/acceptance/top-cookbooks/.kitchen.docker.yml b/acceptance/top-cookbooks/.kitchen.docker.yml deleted file mode 100644 index 41864e3608..0000000000 --- a/acceptance/top-cookbooks/.kitchen.docker.yml +++ /dev/null @@ -1,9 +0,0 @@ -suites: - - name: docker-default - attributes: - 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/cookbooks/base/metadata.rb b/kitchen-tests/cookbooks/base/metadata.rb index 66da34b402..ceb8195de1 100644 --- a/kitchen-tests/cookbooks/base/metadata.rb +++ b/kitchen-tests/cookbooks/base/metadata.rb @@ -10,8 +10,10 @@ gem "chef-sugar" depends "apt" depends "build-essential" +depends "chef-apt-docker" depends "chef-client" depends "chef_hostname" +depends "chef-yum-docker" depends "logrotate" depends "multipackage" depends "nscd" diff --git a/kitchen-tests/cookbooks/base/recipes/default.rb b/kitchen-tests/cookbooks/base/recipes/default.rb index 06f2d9a386..d304f5a5c2 100644 --- a/kitchen-tests/cookbooks/base/recipes/default.rb +++ b/kitchen-tests/cookbooks/base/recipes/default.rb @@ -45,6 +45,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" |