diff options
Diffstat (limited to 'acceptance')
15 files changed, 29 insertions, 25 deletions
diff --git a/acceptance/basics/.kitchen.yml b/acceptance/basics/.kitchen.yml index 4b7a516396..5dad8bcd98 100644 --- a/acceptance/basics/.kitchen.yml +++ b/acceptance/basics/.kitchen.yml @@ -1,4 +1,5 @@ suites: - name: chef-current-install - includes: [ubuntu-14.04, windows-server-2012r2] + #includes: [ubuntu-14.04, windows-server-2012r2] + includes: [ubuntu-14.04] run_list: diff --git a/acceptance/fips/.kitchen.yml b/acceptance/fips/.kitchen.yml index 23280f9142..87dbd30f5d 100644 --- a/acceptance/fips/.kitchen.yml +++ b/acceptance/fips/.kitchen.yml @@ -1,8 +1,10 @@ suites: - name: fips-unit-functional - includes: [centos-6, windows-2012r2] + #includes: [centos-6, windows-2012r2] + includes: [centos-6] run_list: - name: fips-integration - includes: [centos-6, windows-2012r2] + #includes: [centos-6, windows-2012r2] + includes: [centos-6] run_list: 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 203ea9809a..c605083fb2 100644 --- a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb +++ b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb @@ -3,6 +3,8 @@ class TopCookbooks < Chef::Resource property :command, String, name_property: true + # Disabling all windows tests until winrm issue is properly settled. + # action :run do cookbook_kitchen "#{command} docker" do end @@ -15,26 +17,24 @@ class TopCookbooks < Chef::Resource cookbook_relative_dir "cookbooks/learn-the-basics-ubuntu" end - cookbook_kitchen "#{command} learn-the-basics-windows" do - repository "learn-chef/learn-chef-acceptance" - cookbook_relative_dir "cookbooks/learn-the-basics-windows" - end + # cookbook_kitchen "#{command} learn-the-basics-windows" do + # repository "learn-chef/learn-chef-acceptance" + # cookbook_relative_dir "cookbooks/learn-the-basics-windows" + # end - cookbook_kitchen "#{command} powershell" do - end + # cookbook_kitchen "#{command} powershell" do + # end - cookbook_kitchen "#{command} iis" do - end + # cookbook_kitchen "#{command} iis" do + # end - cookbook_kitchen "#{command} sql_server" do - end + # cookbook_kitchen "#{command} sql_server" do + # end - cookbook_kitchen "#{command} winbox" do - repository "adamedx/winbox" - end + # cookbook_kitchen "#{command} winbox" do + # repository "adamedx/winbox" + # end - # Temporarily disabling windows and chocolatey to eliminate - # transient errors on the builders # cookbook_kitchen "#{command} windows" do # end diff --git a/acceptance/top-cookbooks/.kitchen.git.yml b/acceptance/top-cookbooks/.kitchen.git.yml index 302657dffc..3115600ecc 100644 --- a/acceptance/top-cookbooks/.kitchen.git.yml +++ b/acceptance/top-cookbooks/.kitchen.git.yml @@ -6,6 +6,6 @@ suites: - name: git-source run_list: ["recipe[git::source]"] includes: [nonexistent] - - name: git-default-windows - run_list: ["recipe[git]"] - includes: [windows-2012r2] + #- name: git-default-windows + # run_list: ["recipe[git]"] + # includes: [windows-2012r2] diff --git a/acceptance/trivial/.kitchen.yml b/acceptance/trivial/.kitchen.yml index 1e0af03503..cdc0bd6bd4 100644 --- a/acceptance/trivial/.kitchen.yml +++ b/acceptance/trivial/.kitchen.yml @@ -3,5 +3,6 @@ verifier: suites: - name: chef-current-install - includes: [windows-2012r2] + #includes: [ubuntu-14.04, windows-server-2012r2] + includes: [ubuntu-14.04] run_list: diff --git a/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/destroy.rb b/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/destroy.rb deleted file mode 100644 index e2d663ac2f..0000000000 --- a/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/destroy.rb +++ /dev/null @@ -1 +0,0 @@ -kitchen "destroy" diff --git a/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/provision.rb b/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/provision.rb deleted file mode 100644 index 5726c0e7b5..0000000000 --- a/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/provision.rb +++ /dev/null @@ -1 +0,0 @@ -kitchen "converge" diff --git a/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/verify.rb b/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/verify.rb deleted file mode 100644 index 05ac94ce66..0000000000 --- a/acceptance/windows-service/.acceptance/acceptance-cookbook/recipes/verify.rb +++ /dev/null @@ -1 +0,0 @@ -kitchen "verify" diff --git a/acceptance/windows-service/.acceptance/acceptance-cookbook/.gitignore b/acceptance/windows-service_disabled/.acceptance/acceptance-cookbook/.gitignore index 041413b040..041413b040 100644 --- a/acceptance/windows-service/.acceptance/acceptance-cookbook/.gitignore +++ b/acceptance/windows-service_disabled/.acceptance/acceptance-cookbook/.gitignore diff --git a/acceptance/windows-service/.acceptance/acceptance-cookbook/metadata.rb b/acceptance/windows-service_disabled/.acceptance/acceptance-cookbook/metadata.rb index 6c754560f0..6c754560f0 100644 --- a/acceptance/windows-service/.acceptance/acceptance-cookbook/metadata.rb +++ b/acceptance/windows-service_disabled/.acceptance/acceptance-cookbook/metadata.rb diff --git a/acceptance/windows-service_disabled/.acceptance/acceptance-cookbook/recipes/destroy.rb b/acceptance/windows-service_disabled/.acceptance/acceptance-cookbook/recipes/destroy.rb new file mode 100644 index 0000000000..e12f938cf3 --- /dev/null +++ b/acceptance/windows-service_disabled/.acceptance/acceptance-cookbook/recipes/destroy.rb @@ -0,0 +1 @@ +#kitchen "destroy" diff --git a/acceptance/windows-service_disabled/.acceptance/acceptance-cookbook/recipes/provision.rb b/acceptance/windows-service_disabled/.acceptance/acceptance-cookbook/recipes/provision.rb new file mode 100644 index 0000000000..cec9de4e5d --- /dev/null +++ b/acceptance/windows-service_disabled/.acceptance/acceptance-cookbook/recipes/provision.rb @@ -0,0 +1 @@ +#kitchen "converge" diff --git a/acceptance/windows-service_disabled/.acceptance/acceptance-cookbook/recipes/verify.rb b/acceptance/windows-service_disabled/.acceptance/acceptance-cookbook/recipes/verify.rb new file mode 100644 index 0000000000..52e3560cf6 --- /dev/null +++ b/acceptance/windows-service_disabled/.acceptance/acceptance-cookbook/recipes/verify.rb @@ -0,0 +1 @@ +#kitchen "verify" diff --git a/acceptance/windows-service/.kitchen.yml b/acceptance/windows-service_disabled/.kitchen.yml index 5270e81487..5270e81487 100644 --- a/acceptance/windows-service/.kitchen.yml +++ b/acceptance/windows-service_disabled/.kitchen.yml diff --git a/acceptance/windows-service/test/integration/chef-windows-service/inspec/chef_windows_service_spec.rb b/acceptance/windows-service_disabled/test/integration/chef-windows-service/inspec/chef_windows_service_spec.rb index a791177362..a791177362 100644 --- a/acceptance/windows-service/test/integration/chef-windows-service/inspec/chef_windows_service_spec.rb +++ b/acceptance/windows-service_disabled/test/integration/chef-windows-service/inspec/chef_windows_service_spec.rb |