From 5f72ac57337bd4914d87a48bdfb49c2d1d039951 Mon Sep 17 00:00:00 2001 From: John Keiser Date: Wed, 24 Feb 2016 15:10:49 -0800 Subject: Detect whether we are running from chef or chef-dk --- acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb b/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb index 916ca5ca7a..d36909e8b3 100644 --- a/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb +++ b/acceptance/.shared/kitchen_acceptance/libraries/kitchen.rb @@ -7,9 +7,14 @@ module KitchenAcceptance property :instances, String, default: lazy { ENV["KITCHEN_INSTANCES"] ? ENV["KITCHEN_INSTANCES"] : "" } property :kitchen_dir, String, default: Chef.node['chef-acceptance']['suite-dir'] property :chef_product, String, default: lazy { - ENV["KITCHEN_CHEF_PRODUCT"] || - # If we're running the chef or chefdk projects in jenkins, pick up the project name. - (%w(chef chefdk).include?(ENV["PROJECT_NAME"]) ? ENV["PROJECT_NAME"] : "chef") + ENV["KITCHEN_CHEF_PRODUCT"] || begin + # Figure out if we're in chefdk or chef + if ::File.exist?(::File.expand_path("../../chef-dk.gemspec", node['chef-acceptance']['suite-dir'])) + "chefdk" + else + "chef" + end + end } property :chef_channel, String, default: lazy { ENV["KITCHEN_CHEF_CHANNEL"] || -- cgit v1.2.1