summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalim Alam <salam@chef.io>2016-02-08 16:08:29 -0800
committerSalim Alam <salam@chef.io>2016-02-09 15:05:05 -0800
commite05354056d19d6fe44206b111dc3da9a97e5ea16 (patch)
treed128e2f9fd6f6279ad510de5bdf769e4eaec6245
parent18af5835e4e5a6a4beaea44657dfb08093797fd0 (diff)
downloadchef-e05354056d19d6fe44206b111dc3da9a97e5ea16.tar.gz
Enable git, remove rhel
-rw-r--r--acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb2
-rw-r--r--acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb8
2 files changed, 4 insertions, 6 deletions
diff --git a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb
index 09c43d2390..9f4137d1ea 100644
--- a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb
+++ b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/cookbook_kitchen.rb
@@ -15,7 +15,7 @@ class CookbookKitchen < KitchenAcceptance::Kitchen
}
property :repository_root, String, default: lazy { ::File.join(Chef.node["chef-acceptance"]["suite-dir"], "test_run", test_cookbook) }
property :branch, String, default: "master"
- property :cookbook_relative_dir, String
+ property :cookbook_relative_dir, String, default: ""
property :env, default: lazy {
{
"BUNDLE_GEMFILE" => ::File.expand_path("../Gemfile", Chef.node["chef-acceptance"]["suite-dir"]),
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 e669239305..d9086366da 100644
--- a/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
+++ b/acceptance/top-cookbooks/.acceptance/acceptance-cookbook/libraries/top_cookbooks.rb
@@ -4,11 +4,9 @@ class TopCookbooks < Chef::Resource
property :command, String, name_property: true
action :run do
-# cookbook_kitchen "#{command} git"
- # cookbook_kitchen "#{command} learn-the-basics-rhel" do
- # repository "learn-chef/learn-chef-acceptance"
- # cookbook_relative_dir "cookbooks/learn-the-basics-rhel"
- # 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"