summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher A. Snapp <csnapp@chef.io>2020-05-28 08:57:15 -0600
committerChristopher A. Snapp <csnapp@chef.io>2020-05-29 18:02:43 -0600
commit233fb3c4cf1feef79db5274b6a96c91135324f65 (patch)
tree65c9c4e02534490833d683d7bf2b8139a9495bf7
parentcb26b4af304c39684492ac15ced0b6128af9d300 (diff)
downloadchef-233fb3c4cf1feef79db5274b6a96c91135324f65.tar.gz
Add windows support to end_to_end::default
Signed-off-by: Christopher A. Snapp <csnapp@chef.io>
-rw-r--r--kitchen-tests/cookbooks/end_to_end/attributes/default.rb1
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/default.rb9
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/linux.rb2
3 files changed, 11 insertions, 1 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/attributes/default.rb b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb
index 332a3fe462..8c95e888fe 100644
--- a/kitchen-tests/cookbooks/end_to_end/attributes/default.rb
+++ b/kitchen-tests/cookbooks/end_to_end/attributes/default.rb
@@ -1,5 +1,6 @@
puts "CHEF UTILS THINKS WE ARE ON UBUNTU" if ubuntu?
puts "CHEF UTILS THINKS WE ARE ON RHEL" if rhel?
+puts "CHEF UTILS THINKS WE ARE ON WINDOWS" if windows?
#
# ubuntu cookbook overrides
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/default.rb b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb
new file mode 100644
index 0000000000..eae5cfd3ad
--- /dev/null
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/default.rb
@@ -0,0 +1,9 @@
+#
+# Cookbook:: end_to_end
+# Recipe:: default
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+#
+
+include_recipe "::linux" if platform_family?("rhel", "debian")
+include_recipe "::windows" if windows?
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
index f175474d46..b66edb14dd 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
@@ -1,6 +1,6 @@
#
# Cookbook:: end_to_end
-# Recipe:: default
+# Recipe:: linux
#
# Copyright:: Copyright (c) Chef Software Inc.
#