From d656e9b7c3a073bc17ce140fb07dbe855ddc638f Mon Sep 17 00:00:00 2001 From: Ashique Saidalavi Date: Mon, 25 Nov 2024 17:04:09 +0530 Subject: [PATCH 1/5] Updated the pkg description Signed-off-by: Ashique Saidalavi --- habitat/plan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/habitat/plan.sh b/habitat/plan.sh index f6e395a6f..d74f0cc15 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -3,7 +3,7 @@ _chef_client_ruby="core/ruby3_1" pkg_name="chef-test-kitchen-enterprise" pkg_origin="chef" pkg_maintainer="The Chef Maintainers " -pkg_description="The Chef Test Kitchen" +pkg_description="The Chef Test Kitchen Enterprise" pkg_license=('Apache-2.0') pkg_bin_dirs=( bin From 58c211c35eddf0b6605ce2902a1265d05bb0f07c Mon Sep 17 00:00:00 2001 From: Ashique Saidalavi Date: Tue, 26 Nov 2024 13:30:44 +0530 Subject: [PATCH 2/5] Updated the gemfile to use kitchen-dokken from main branch Signed-off-by: Ashique Saidalavi --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 42734a504..6682c6185 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" gemspec gem "appbundler" gem "pry" -gem "kitchen-dokken", git: "https://github.com/chef/kitchen-dokken", branch: "hab_testing_branch" +gem "kitchen-dokken", git: "https://github.com/chef/kitchen-dokken", branch: "main" gem "kitchen-inspec", git: "https://github.com/inspec/kitchen-inspec", branch: "temp-point-to-chef-test-kitchen-ent" group :test do From 6a6b4c17e692e8ccc736e044df511ab53f3a1f3e Mon Sep 17 00:00:00 2001 From: Ashique Saidalavi Date: Tue, 26 Nov 2024 15:41:02 +0530 Subject: [PATCH 3/5] Added logs for testing Signed-off-by: Ashique Saidalavi --- .expeditor/buildkite/artifact.habitat.test.ps1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.expeditor/buildkite/artifact.habitat.test.ps1 b/.expeditor/buildkite/artifact.habitat.test.ps1 index 811764eb5..c4ee1869a 100755 --- a/.expeditor/buildkite/artifact.habitat.test.ps1 +++ b/.expeditor/buildkite/artifact.habitat.test.ps1 @@ -9,7 +9,7 @@ $env:HAB_BLDR_CHANNEL = "LTS-2024" $env:HAB_ORIGIN = 'ci' $env:CHEF_LICENSE = 'accept-no-persist' $env:HAB_LICENSE = 'accept-no-persist' -$Plan = 'test-kitchen' +$Plan = 'chef-test-kitchen-enterprise' Write-Host "--- system details" $Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture' @@ -32,9 +32,11 @@ function Install-Habitat { } try { - hab --version + $v = hab --version + Write-Host "Habitat version:$v is already installed." } catch { + Write-Host "Habitat is not installed, installing..." Set-ExecutionPolicy Bypass -Scope Process -Force Stop-HabProcess @@ -90,4 +92,4 @@ try { finally { # Ensure we always return to the original directory Pop-Location -} \ No newline at end of file +} From d4b09e50525f0b1cd6cfca4acae3151329cd1572 Mon Sep 17 00:00:00 2001 From: Ashique Saidalavi Date: Tue, 26 Nov 2024 16:38:41 +0530 Subject: [PATCH 4/5] Removed the windows habitat verify pipelines Signed-off-by: Ashique Saidalavi --- .expeditor/habitat-test.pipeline.yml | 31 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml index afc6244e4..5089fd325 100644 --- a/.expeditor/habitat-test.pipeline.yml +++ b/.expeditor/habitat-test.pipeline.yml @@ -18,18 +18,19 @@ steps: image: ruby:3.1 privileged: true - - label: ":windows: Validate Habitat Builds of Test Kitchen" - commands: - - .expeditor/buildkite/artifact.habitat.test.ps1 - expeditor: - executor: - docker: - host_os: windows - shell: ["powershell", "-Command"] - image: rubydistros/windows-2019:3.1 - user: 'NT AUTHORITY\SYSTEM' - environment: - - FORCE_FFI_YAJL=ext - - EXPIRE_CACHE=true - - CHEF_LICENSE=accept-no-persist - - CHEF_LICENSE_SERVER=http://hosted-license-service-lb-8000-606952349.us-west-2.elb.amazonaws.com:8000/ +# Commenting out the Windows test since it is not required for the RC1 release +# - label: ":windows: Validate Habitat Builds of Test Kitchen" +# commands: +# - .expeditor/buildkite/artifact.habitat.test.ps1 +# expeditor: +# executor: +# docker: +# host_os: windows +# shell: ["powershell", "-Command"] +# image: rubydistros/windows-2019:3.1 +# user: 'NT AUTHORITY\SYSTEM' +# environment: +# - FORCE_FFI_YAJL=ext +# - EXPIRE_CACHE=true +# - CHEF_LICENSE=accept-no-persist +# - CHEF_LICENSE_SERVER=http://hosted-license-service-lb-8000-606952349.us-west-2.elb.amazonaws.com:8000/ From f6f9f969d789cc6fc4969668aa198acef398a11b Mon Sep 17 00:00:00 2001 From: Ashique Saidalavi Date: Tue, 26 Nov 2024 16:39:28 +0530 Subject: [PATCH 5/5] Removed the logs Signed-off-by: Ashique Saidalavi --- .expeditor/buildkite/artifact.habitat.test.ps1 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.expeditor/buildkite/artifact.habitat.test.ps1 b/.expeditor/buildkite/artifact.habitat.test.ps1 index c4ee1869a..ee2f366d6 100755 --- a/.expeditor/buildkite/artifact.habitat.test.ps1 +++ b/.expeditor/buildkite/artifact.habitat.test.ps1 @@ -32,11 +32,9 @@ function Install-Habitat { } try { - $v = hab --version - Write-Host "Habitat version:$v is already installed." + hab --version } catch { - Write-Host "Habitat is not installed, installing..." Set-ExecutionPolicy Bypass -Scope Process -Force Stop-HabProcess @@ -92,4 +90,4 @@ try { finally { # Ensure we always return to the original directory Pop-Location -} +} \ No newline at end of file