From a823aaaca0dba5428827c04230a019f9cfb67380 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Fri, 30 Jan 2026 11:06:29 +0530 Subject: [PATCH 1/5] fixing lint failure and spec failure Signed-off-by: nikhil2611 --- Gemfile | 1 + cleanup_lint_roller.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 762d9442..599728e2 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,7 @@ group :test do gem "cookstyle", ">= 7.32" gem "faraday_middleware" gem "chef-test-kitchen-enterprise", git: "https://github.com/chef/chef-test-kitchen-enterprise", branch: "main" + gem "kitchen-chef-enterprise", git: "https://github.com/chef/kitchen-chef-enterprise", branch: "main" gem "simplecov", require: false end diff --git a/cleanup_lint_roller.rb b/cleanup_lint_roller.rb index 801ceaf9..b29fba50 100644 --- a/cleanup_lint_roller.rb +++ b/cleanup_lint_roller.rb @@ -24,4 +24,4 @@ def cleanup_lint_roller_lockfile warn " Warning: Failed to clean up lint_roller Gemfile.lock: #{e.message}" end -cleanup_lint_roller_lockfile \ No newline at end of file +cleanup_lint_roller_lockfile From 4c8ae77eb2e22c9fad512f099c0e4d42c349514f Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Fri, 30 Jan 2026 18:57:13 +0530 Subject: [PATCH 2/5] trying to add gem - kitchen-omnibus-chef Signed-off-by: nikhil2611 --- Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 599728e2..bcdf38cc 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,8 @@ group :test do gem "cookstyle", ">= 7.32" gem "faraday_middleware" gem "chef-test-kitchen-enterprise", git: "https://github.com/chef/chef-test-kitchen-enterprise", branch: "main" - gem "kitchen-chef-enterprise", git: "https://github.com/chef/kitchen-chef-enterprise", branch: "main" + # gem "kitchen-chef-enterprise", git: "https://github.com/chef/kitchen-chef-enterprise", branch: "main" + gem "kitchen-omnibus-chef", "~> 1.1" gem "simplecov", require: false end From d138861a25e25a041ea52ed8193134558a35347f Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 2 Feb 2026 23:31:34 +0530 Subject: [PATCH 3/5] added comment for replacing kitchen-omnibus-chef with kitchen-chef-enterprise Signed-off-by: nikhil2611 --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index bcdf38cc..3646e64c 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,8 @@ group :test do gem "cookstyle", ">= 7.32" gem "faraday_middleware" gem "chef-test-kitchen-enterprise", git: "https://github.com/chef/chef-test-kitchen-enterprise", branch: "main" + # TODO: Replace kitchen-omnibus-chef with kitchen-chef-enterprise once private repo access is available for public runners + # kitchen-omnibus-chef is deprecated and won't receive updates, but provides chef-zero provisioner functionality # gem "kitchen-chef-enterprise", git: "https://github.com/chef/kitchen-chef-enterprise", branch: "main" gem "kitchen-omnibus-chef", "~> 1.1" gem "simplecov", require: false From 771a1e730f763bb79fd732c7ceaaa6b8dd916e69 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Tue, 3 Feb 2026 15:44:35 +0530 Subject: [PATCH 4/5] added alias gemspec test-kitchen Signed-off-by: nikhil2611 --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 3646e64c..557ce68c 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,7 @@ group :test do gem "cookstyle", ">= 7.32" gem "faraday_middleware" gem "chef-test-kitchen-enterprise", git: "https://github.com/chef/chef-test-kitchen-enterprise", branch: "main" + gem "test-kitchen", git: "https://github.com/chef/chef-test-kitchen-enterprise", branch: "main", glob: "test-kitchen.gemspec" # TODO: Replace kitchen-omnibus-chef with kitchen-chef-enterprise once private repo access is available for public runners # kitchen-omnibus-chef is deprecated and won't receive updates, but provides chef-zero provisioner functionality # gem "kitchen-chef-enterprise", git: "https://github.com/chef/kitchen-chef-enterprise", branch: "main" From 2107cb38186bd2381a6c22870caa125dbe8b0317 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Tue, 3 Feb 2026 16:25:47 +0530 Subject: [PATCH 5/5] finxing windows hab test pipeline Signed-off-by: nikhil2611 --- post-bundle-install.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/post-bundle-install.rb b/post-bundle-install.rb index e9ae4304..f61e54d8 100644 --- a/post-bundle-install.rb +++ b/post-bundle-install.rb @@ -16,15 +16,17 @@ matches = File.basename(gempath).match(/.*-[A-Fa-f0-9]{12}/) next unless matches - gem_name = File.basename(Dir["#{gempath}/*.gemspec"].first, ".gemspec") - # FIXME: should strip any valid ruby platform off of the gem_name if it matches + Dir["#{gempath}/*.gemspec"].each do |gemspec_path| + gem_name = File.basename(gemspec_path, ".gemspec") + # FIXME: should strip any valid ruby platform off of the gem_name if it matches - next unless gem_name + next unless gem_name - puts "re-installing #{gem_name}..." + puts "re-installing #{gem_name}..." - Dir.chdir(gempath) do - system("gem build #{gem_name}.gemspec") or raise "gem build failed" - system("gem install #{gem_name}*.gem --conservative --minimal-deps --no-document") or raise "gem install failed" + Dir.chdir(gempath) do + system("gem build #{gem_name}.gemspec") or raise "gem build failed" + system("gem install #{gem_name}*.gem --conservative --minimal-deps --no-document") or raise "gem install failed" + end end end