summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalim Alam <salam@chef.io>2016-03-11 09:30:14 -0800
committerSalim Alam <salam@chef.io>2016-03-11 09:30:14 -0800
commit7f970035bee3ea4ac0c582df0fcffaf3df516d6d (patch)
tree509693705c748f23823856463b86e3df71bcc96e
parent0f56b63faa8812822b0f644424fad64f32c61dce (diff)
parent96c916db660a76aa1eeaa965cafb0220103c16e1 (diff)
downloadchef-7f970035bee3ea4ac0c582df0fcffaf3df516d6d.tar.gz
Merge pull request #4683 from chef/salam/acceptance-tweak
Add cookbooks for 64-bit Windows test matrix
-rw-r--r--acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb20
-rw-r--r--acceptance/top-cookbooks/.kitchen.chocolatey.yml6
-rw-r--r--acceptance/top-cookbooks/.kitchen.iis.yml4
-rw-r--r--acceptance/top-cookbooks/.kitchen.powershell.yml4
-rw-r--r--acceptance/top-cookbooks/.kitchen.sql_server.yml5
-rw-r--r--acceptance/top-cookbooks/.kitchen.winbox.yml8
-rw-r--r--acceptance/top-cookbooks/.kitchen.windows.yml38
7 files changed, 85 insertions, 0 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 3098b334ce..83271d243d 100644
--- a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
+++ b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
@@ -19,5 +19,25 @@ class TopCookbooks < Chef::Resource
repository "learn-chef/learn-chef-acceptance"
cookbook_relative_dir "cookbooks/learn-the-basics-windows"
end
+
+ cookbook_kitchen "#{command} powershell" do
+ end
+
+ cookbook_kitchen "#{command} windows" do
+ end
+
+ cookbook_kitchen "#{command} iis" do
+ end
+
+ cookbook_kitchen "#{command} sql_server" do
+ end
+
+ cookbook_kitchen "#{command} winbox" do
+ repository "adamedx/winbox"
+ end
+
+ cookbook_kitchen "#{command} chocolatey" do
+ repository "chocolatey/chocolatey-cookbook"
+ end
end
end
diff --git a/acceptance/top-cookbooks/.kitchen.chocolatey.yml b/acceptance/top-cookbooks/.kitchen.chocolatey.yml
new file mode 100644
index 0000000000..7d7529d69f
--- /dev/null
+++ b/acceptance/top-cookbooks/.kitchen.chocolatey.yml
@@ -0,0 +1,6 @@
+suites:
+ - name: default
+ run_list:
+ - recipe[chocolatey::default]
+ - recipe[chocolatey_test::default]
+ includes: [windows-2012r2]
diff --git a/acceptance/top-cookbooks/.kitchen.iis.yml b/acceptance/top-cookbooks/.kitchen.iis.yml
new file mode 100644
index 0000000000..ffbc23caba
--- /dev/null
+++ b/acceptance/top-cookbooks/.kitchen.iis.yml
@@ -0,0 +1,4 @@
+suites:
+ - name: iis
+ run_list: ["recipe[iis::default]"]
+ includes: [windows-2012r2]
diff --git a/acceptance/top-cookbooks/.kitchen.powershell.yml b/acceptance/top-cookbooks/.kitchen.powershell.yml
new file mode 100644
index 0000000000..6fad2364bb
--- /dev/null
+++ b/acceptance/top-cookbooks/.kitchen.powershell.yml
@@ -0,0 +1,4 @@
+suites:
+ - name: powershell
+ run_list: ["recipe[powershell::powershell2]"]
+ includes: [windows-2012r2]
diff --git a/acceptance/top-cookbooks/.kitchen.sql_server.yml b/acceptance/top-cookbooks/.kitchen.sql_server.yml
new file mode 100644
index 0000000000..51a6bd6616
--- /dev/null
+++ b/acceptance/top-cookbooks/.kitchen.sql_server.yml
@@ -0,0 +1,5 @@
+suites:
+ - name: sql_server
+ run_list: ["recipe[sql_server::default]"]
+ attributes: { sql_server: { accept_eula: true } }
+ includes: [windows-2012r2]
diff --git a/acceptance/top-cookbooks/.kitchen.winbox.yml b/acceptance/top-cookbooks/.kitchen.winbox.yml
new file mode 100644
index 0000000000..9cf39a0d5b
--- /dev/null
+++ b/acceptance/top-cookbooks/.kitchen.winbox.yml
@@ -0,0 +1,8 @@
+suites:
+ - name: default
+ run_list:
+ - recipe[winbox::default]
+ includes: [windows-2012r2]
+
+verifier:
+ name: dummy
diff --git a/acceptance/top-cookbooks/.kitchen.windows.yml b/acceptance/top-cookbooks/.kitchen.windows.yml
new file mode 100644
index 0000000000..38c86ff322
--- /dev/null
+++ b/acceptance/top-cookbooks/.kitchen.windows.yml
@@ -0,0 +1,38 @@
+suites:
+ # Waiting on https://github.com/chef-cookbooks/windows/pull/350
+ # - name: tasks
+ # run_list:
+ # - recipe[windows::default]
+ # - recipe[minimal::tasks]
+ # includes: [windows-2012r2]
+ - name: path
+ run_list:
+ - recipe[windows::default]
+ - recipe[minimal::path]
+ includes: [windows-2012r2]
+ - name: certificate
+ run_list:
+ - recipe[windows::default]
+ - recipe[minimal::certificate]
+ includes: [windows-2012r2]
+ # Package is deprecated
+ # - name: package
+ # run_list:
+ # - recipe[windows::default]
+ # - recipe[minimal::package]
+ # includes: [windows-2012r2]
+ - name: feature
+ run_list:
+ - recipe[windows::default]
+ - recipe[minimal::feature]
+ includes: [windows-2012r2]
+ - name: http_acl
+ run_list:
+ - recipe[windows::default]
+ - recipe[minimal::http_acl]
+ includes: [windows-2012r2]
+ - name: font
+ run_list:
+ - recipe[windows::default]
+ - recipe[minimal::font]
+ includes: [windows-2012r2]