From 2e90b71f236f03756a0047516df93f53f558ab8e Mon Sep 17 00:00:00 2001 From: nitin sanghi Date: Tue, 5 Nov 2024 15:53:36 +0530 Subject: [PATCH] Change in the plan to fix fetching test-kitchen gem Signed-off-by: nitin sanghi --- habitat/plan.ps1 | 10 +++++----- habitat/plan.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 6663b5de6..d30e2b39f 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -45,7 +45,7 @@ function Invoke-Build { Write-BuildLine " ** Using bundler to retrieve the Ruby dependencies" bundle install - gem build test-kitchen.gemspec + gem build chef-test-kitchen-enterprise.gemspec Write-BuildLine " ** Using gem to install" gem install chef-test-kitchen-enterprise*.gem --no-document gem install kitchen-dokken @@ -65,11 +65,11 @@ function Invoke-Install { try { Push-Location $pkg_prefix bundle config --local gemfile $project_root/Gemfile - Write-BuildLine "** generating binstubs for test-kitchen with precise version pins" - Write-BuildLine "** generating binstubs for test-kitchen with precise version pins $project_root $pkg_prefix/bin " - Invoke-Expression -Command "appbundler.bat $project_root $pkg_prefix/bin test-kitchen" + Write-BuildLine "** generating binstubs for chef-test-kitchen-enterprise with precise version pins" + Write-BuildLine "** generating binstubs for chef-test-kitchen-enterprise with precise version pins $project_root $pkg_prefix/bin " + Invoke-Expression -Command "appbundler.bat $project_root $pkg_prefix/bin chef-test-kitchen-enterprise" If ($lastexitcode -ne 0) { Exit $lastexitcode } - Write-BuildLine " ** Running the test-kitchen project's 'rake install' to install the path-based gems so they look like any other installed gem." + Write-BuildLine " ** Running the chef-test-kitchen-enterprise project's 'rake install' to install the path-based gems so they look like any other installed gem." If ($lastexitcode -ne 0) { Exit $lastexitcode } } finally { diff --git a/habitat/plan.sh b/habitat/plan.sh index 67d2410b1..ffefaafd4 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -90,7 +90,7 @@ do_install() { build_line "** fixing binstub shebangs" fix_interpreter "${pkg_prefix}/vendor/bin/*" "$_chef_client_ruby" bin/ruby export BUNDLE_GEMFILE="${CACHE_PATH}/Gemfile" - for gem in test-kitchen; do + for gem in chef-test-kitchen-enterprise; do build_line "** generating binstubs for $gem with precise version pins" appbundler $CACHE_PATH $pkg_prefix/bin $gem done