diff options
| author | Scott Hain <shain@chef.io> | 2017-12-14 16:57:31 -0800 |
|---|---|---|
| committer | Scott Hain <shain@chef.io> | 2017-12-15 10:47:53 -0800 |
| commit | ace946260f63d218462a981831453f76021902c7 (patch) | |
| tree | 7e3a1984bfd647eaaa88988547c95a75e5f6c0a6 /acceptance | |
| parent | 8c9cc06ee3d0a8abe4984a88882211e63fd86b75 (diff) | |
| download | chef-ace946260f63d218462a981831453f76021902c7.tar.gz | |
Move git and docker setup top cookbook tests to travis.shain/move_git_and_docker_cookbook_tests
Signed-off-by: Scott Hain <shain@chef.io>
Diffstat (limited to 'acceptance')
3 files changed, 1 insertions, 30 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 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] |