From 45d069984c55a7cd61bcfc0a4343b069ce78073f Mon Sep 17 00:00:00 2001
From: nikhil2611 <nikhilgupta2102@gmail.com>
Date: Thu, 28 Nov 2024 15:57:55 +0530
Subject: [PATCH 01/10] added github action pipeline to verify build and
 publish package

Signed-off-by: nikhil2611 <nikhilgupta2102@gmail.com>
---
 .github/workflows/habitat-build.yml   | 102 +++++++++++++++++++++++
 .github/workflows/habitat-publish.yml | 113 ++++++++++++++++++++++++++
 .github/workflows/verify.yml          |  40 +++++++++
 3 files changed, 255 insertions(+)
 create mode 100644 .github/workflows/habitat-build.yml
 create mode 100644 .github/workflows/habitat-publish.yml
 create mode 100644 .github/workflows/verify.yml

diff --git a/.github/workflows/habitat-build.yml b/.github/workflows/habitat-build.yml
new file mode 100644
index 00000000..4ed24d61
--- /dev/null
+++ b/.github/workflows/habitat-build.yml
@@ -0,0 +1,102 @@
+name: Build Habitat packages
+      
+on:
+  push:
+    branches:
+      - workstation-LTS
+  pull_request:
+    branches:
+      - workstation-LTS
+
+env:
+  # BLDR URL Defined as: 'https://bldr.habitat.sh/' but as an env var in workspace settings. 
+  BLDR_URL: ${{vars.BLDR_URL}}
+   # HAB_ORIGIN Defined as: 'chef-platform' defined in workspace settings.
+  HAB_ORIGIN: ${{vars.HAB_ORIGIN}}
+  # BLDR_CHANNEL defaulted to unstable, but can be switched to stable, it is defined via the environment setting https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#using-an-environment
+  BLDR_CHANNEL: ${{ vars.BLDR_CHANNEL }}
+  # HABITAT_VERSION_SET this is the version of habitat CLI you are using, defaults to latest.
+  HABITAT_VERSION_SET: ${{vars.HABITAT_VERSION_SET}}
+  # HAB_AUTH_TOKEN your orgs/projects auth token value
+  HAB_AUTH_TOKEN: ${{ secrets.HAB_AUTH_TOKEN }}
+  # HABITAT_TARGET this is the CPU arch for the linux CLI tool, its defaulted to x86_64
+  #HABITAT_TARGET: $#{{vars.HABITAT_TARGET}}
+  HAB_FALLBACK_CHANNEL: ${{vars.HAB_FALLBACK_CHANNEL}}
+
+permissions:
+  contents: write
+
+jobs:
+  pre-build:
+    name: Setup before building packages
+    runs-on: ubuntu-latest
+    outputs:
+      app_version: ${{ steps.app_version.outputs.APP_VERSION }}
+    steps:
+      - name: Get branch name
+        id: get_branch_name
+        run: |
+          echo "BRANCH_NAME=${GITHUB_REF_NAME//\//-}" >> "$GITHUB_OUTPUT"
+      - name: Get version from tag
+        id: app_version
+        run: |
+          echo "APP_VERSION=${{ github.ref_type == 'tag' && github.ref_name || format('{0}-{1}', steps.get_branch_name.outputs.BRANCH_NAME, github.sha) }}" >> "$GITHUB_OUTPUT"
+  agent-matrix:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+      # matrix strategy is described at https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
+
+    runs-on: ${{ matrix.os }}
+    # free runner types are https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
+    # from macos-latest, windows-latest, ubuntu-latest, ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016
+    # included software packages on runners are at https://github.com/actions/runner-images#available-images 
+    # defaulted to unstable, but can be switched to stable, it is defined via the environment setting https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#using-an-environment
+    # environment: unstable 
+    steps:
+      - name: print OS
+        run: echo "--- ${{ matrix.os }}"
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+
+      - name: install habitat on Linux
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        shell: bash
+        run: |
+          echo "--- STARTING HAB INSTALL ON  ${{ matrix.os }} UBUNTU with habitat version:${{vars.HABITAT_VERSION_SET}}"
+          export HABITAT_VERSION="${{vars.HABITAT_VERSION_SET}}"
+          export HAB_FALLBACK_CHANNEL="${{vars.HAB_FALLBACK_CHANNEL}}"
+          HABITAT_VERSION="${HABITAT_VERSION:?HABITAT_VERSION must be set}"
+          HABITAT_TARGET="${HABITAT_TARGET:-x86_64-linux}"
+          curl https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh | sudo bash -s -- -v "$HABITAT_VERSION" -t "$HABITAT_TARGET"
+      - name: run Habitat packaging (linux)
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        shell: bash
+        run: |
+          hab license accept
+          hab origin key download $HAB_ORIGIN
+          hab origin key download --auth $HAB_AUTH_TOKEN --secret $HAB_ORIGIN
+          echo "--- running linux hab build"
+          hab pkg build .
+      - name: Install Habitat on Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        shell: pwsh
+        run: |
+          write-output "--- STARTING HAB INSTALL ON ${{ matrix.os }} WINDOWS with habitat version:${{vars.HABITAT_VERSION_SET}}"
+          $env:HAB_LICENSE = "accept-no-persist"
+          $env:HAB_FALLBACK_CHANNEL= "${{vars.HAB_FALLBACK_CHANNEL}}"
+          Invoke-Expression "& { $(Invoke-RestMethod https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1) } -Version ${{vars.HABITAT_VERSION_SET}}"
+      - name: run habitat packaging windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        shell: pwsh
+        run: |
+          $env:Path += ";C:\ProgramData\Habitat"
+          hab license accept
+          hab origin key download ${{ env.HAB_ORIGIN }}
+          hab origin key download --auth ${{ secrets.HAB_AUTH_TOKEN }} --secret ${{ env.HAB_ORIGIN }}
+          write-output "--- running windows hab build"
+          hab pkg build .
diff --git a/.github/workflows/habitat-publish.yml b/.github/workflows/habitat-publish.yml
new file mode 100644
index 00000000..d87e2463
--- /dev/null
+++ b/.github/workflows/habitat-publish.yml
@@ -0,0 +1,113 @@
+name: Publish Habitat packages
+
+on:
+  push:
+    branches:
+      - workstation-LTS
+  release:
+    types:
+      - created
+
+env:
+  # BLDR URL Defined as: 'https://bldr.habitat.sh/' but as an env var in workspace settings. 
+  BLDR_URL: ${{vars.BLDR_URL}}
+   # HAB_ORIGIN Defined as: 'chef-platform' defined in workspace settings.
+  HAB_ORIGIN: ${{vars.HAB_ORIGIN}}
+  # BLDR_CHANNEL defaulted to unstable, but can be switched to stable, it is defined via the environment setting https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#using-an-environment
+  BLDR_CHANNEL: ${{ vars.BLDR_CHANNEL }}
+  # HABITAT_VERSION_SET this is the version of habitat CLI you are using, defaults to latest.
+  HABITAT_VERSION_SET: ${{vars.HABITAT_VERSION_SET}}
+  # HAB_PACKAGE is the name of the project you are on, IE: node-management-agent
+  HAB_PACKAGE: ${{vars.HAB_PACKAGE}}
+  # HAB_AUTH_TOKEN your orgs/projects auth token value
+  HAB_AUTH_TOKEN: ${{ secrets.HAB_AUTH_TOKEN }}
+  HAB_FALLBACK_CHANNEL: ${{vars.HAB_FALLBACK_CHANNEL}}
+  # HABITAT_TARGET this is the CPU arch for the linux CLI tool, its defaulted to x86_64
+  #HABITAT_TARGET: $#{{vars.HABITAT_TARGET}}
+  # org-wide access token on https://github.com/organizations/progress-platform-services/settings/secrets/actions
+
+permissions:
+  contents: write
+
+jobs:
+  pre-build:
+    name: Setup before building packages
+    runs-on: ubuntu-latest
+    outputs:
+      app_version: ${{ steps.app_version.outputs.APP_VERSION }}
+    steps:
+      - name: Get branch name
+        id: get_branch_name
+        run: |
+          echo "BRANCH_NAME=${GITHUB_REF_NAME//\//-}" >> "$GITHUB_OUTPUT"
+      - name: Get version from tag
+        id: app_version
+        run: |
+          echo "APP_VERSION=${{ github.ref_type == 'tag' && github.ref_name || format('{0}-{1}', steps.get_branch_name.outputs.BRANCH_NAME, github.sha) }}" >> "$GITHUB_OUTPUT"
+  agent-matrix:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+      # matrix strategy is described at https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
+
+    runs-on: ${{ matrix.os }}
+    # free runner types are https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
+    # from macos-latest, windows-latest, ubuntu-latest, ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016
+    # included software packages on runners are at https://github.com/actions/runner-images#available-images 
+    # environment: unstable
+    steps:
+      - name: print OS
+        run: echo "--- ${{ matrix.os }}"
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+
+      - name: install habitat on Linux
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        shell: bash
+        run: |
+          echo "--- STARTING HAB INSTALL ON  ${{ matrix.os }} UBUNTU with habitat version:${{vars.HABITAT_VERSION_SET}}"
+          export HABITAT_VERSION="${{vars.HABITAT_VERSION_SET}}"
+          HABITAT_VERSION="${HABITAT_VERSION:?HABITAT_VERSION must be set}"
+          HABITAT_TARGET="${HABITAT_TARGET:-x86_64-linux}"
+          export HAB_FALLBACK_CHANNEL="${{vars.HAB_FALLBACK_CHANNEL}}"
+          curl https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh | sudo bash -s -- -v "$HABITAT_VERSION" -t "$HABITAT_TARGET"
+      - name: run Habitat packaging (linux)
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        shell: bash
+        run: |
+          hab license accept
+          hab origin key download $HAB_ORIGIN
+          hab origin key download --auth $HAB_AUTH_TOKEN --secret $HAB_ORIGIN
+          echo "--- running linux hab build"
+          hab pkg build .
+          echo "--- pushing to ${{ env.BLDR_URL }}/#/${{ env.HAB_ORIGIN }}/${{ env.HAB_PACKAGE }}..."
+          source results/last_build.env
+          hab pkg upload --auth $HAB_AUTH_TOKEN results/$pkg_artifact
+          echo "--- push complete!!"
+      - name: Install Habitat on Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        shell: pwsh
+        run: |
+          write-output "--- STARTING HAB INSTALL ON ${{ matrix.os }} WINDOWS with habitat version:${{vars.HABITAT_VERSION_SET}}"
+          $env:HAB_LICENSE = "accept-no-persist"
+          $env:HAB_FALLBACK_CHANNEL= "${{vars.HAB_FALLBACK_CHANNEL}}"
+          Invoke-Expression "& { $(Invoke-RestMethod https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1) } -Version ${{vars.HABITAT_VERSION_SET}}"
+      - name: run habitat packaging windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        shell: pwsh
+        run: |
+          $env:Path += ";C:\ProgramData\Habitat"
+          hab license accept
+          hab origin key download ${{ env.HAB_ORIGIN }}
+          hab origin key download --auth ${{ secrets.HAB_AUTH_TOKEN }} --secret ${{ env.HAB_ORIGIN }}
+          write-output "--- running windows hab build"
+          hab pkg build .
+          write-output "--- pushing hab to unstable channel"
+          . results\last_build.ps1
+          hab pkg upload results\$pkg_artifact --auth ${{ secrets.HAB_AUTH_TOKEN }}
+          write-output "--- push complete!!"
+          outreach
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
new file mode 100644
index 00000000..ab8f49c1
--- /dev/null
+++ b/.github/workflows/verify.yml
@@ -0,0 +1,40 @@
+name: Verify Pipeline
+
+on:
+  # Trigger the workflow on push or pull request,
+  # but only for the main branch
+  push:
+    branches:
+      - workstation-LTS
+  pull_request:
+    branches:
+      - workstation-LTS
+
+jobs:    
+  unit-tests:
+    name: Execute Tests cases
+    runs-on: ubuntu-latest
+    
+    steps:
+      # Step 1: Checkout the code
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      # Step 2: Set up Ruby
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1 # Use Ruby 3.1 as specified
+
+      # Step 3: Install project dependencies
+      - name: Install Bundler and Dependencies
+        run: |
+          rm -f .bundle/config
+          gem install bundler
+          bundle config set --local path 'vendor/bundle'
+          bundle install --jobs=3 --retry=3
+
+       # Step 4: Run the Unit tests
+      - name: Run Unit Tests
+        run: |
+          bundle exec rspec

From ec0487cdc61cbb29d3963f375f6ec00724458f48 Mon Sep 17 00:00:00 2001
From: nikhil2611 <nikhilgupta2102@gmail.com>
Date: Mon, 2 Dec 2024 16:20:23 +0530
Subject: [PATCH 02/10] verifying hab package

Signed-off-by: nikhil2611 <nikhilgupta2102@gmail.com>
---
 .github/workflows/habitat-build.yml   | 16 ++++++++++++-
 .github/workflows/habitat-publish.yml |  3 +--
 habitat/tests/test.pester.ps1         | 33 +++++++++++++++++++++++++++
 habitat/tests/test.ps1                | 19 +++++++++++++++
 habitat/tests/test.sh                 | 24 +++++++++++++++++++
 5 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 habitat/tests/test.pester.ps1
 create mode 100644 habitat/tests/test.ps1
 create mode 100644 habitat/tests/test.sh

diff --git a/.github/workflows/habitat-build.yml b/.github/workflows/habitat-build.yml
index 4ed24d61..7a05750c 100644
--- a/.github/workflows/habitat-build.yml
+++ b/.github/workflows/habitat-build.yml
@@ -11,7 +11,7 @@ on:
 env:
   # BLDR URL Defined as: 'https://bldr.habitat.sh/' but as an env var in workspace settings. 
   BLDR_URL: ${{vars.BLDR_URL}}
-   # HAB_ORIGIN Defined as: 'chef-platform' defined in workspace settings.
+   # HAB_ORIGIN Defined as: 'chef' defined in workspace settings.
   HAB_ORIGIN: ${{vars.HAB_ORIGIN}}
   # BLDR_CHANNEL defaulted to unstable, but can be switched to stable, it is defined via the environment setting https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#using-an-environment
   BLDR_CHANNEL: ${{ vars.BLDR_CHANNEL }}
@@ -82,6 +82,16 @@ jobs:
           hab origin key download --auth $HAB_AUTH_TOKEN --secret $HAB_ORIGIN
           echo "--- running linux hab build"
           hab pkg build .
+          hartfile=$(ls ./results | grep "cookstyle" | tail -n 1)
+          sudo hab license accept
+          export CHEF_LICENSE="accept-no-persist"
+          export HAB_LICENSE="accept-no-persist"
+          export HAB_NONINTERACTIVE="true"
+          sudo hab pkg install ./results/$hartfile
+          . ./results/last_build.env
+          export pkg_ident
+          chmod +x habitat/tests/test.sh
+          habitat/tests/test.sh
       - name: Install Habitat on Windows
         if: ${{ matrix.os == 'windows-latest' }}
         shell: pwsh
@@ -100,3 +110,7 @@ jobs:
           hab origin key download --auth ${{ secrets.HAB_AUTH_TOKEN }} --secret ${{ env.HAB_ORIGIN }}
           write-output "--- running windows hab build"
           hab pkg build .
+          hartfile=$(ls ./results | grep "cookstyle" | tail -n 1)
+          hab pkg install ./results/$hartfile
+          . ./results/last_build.env
+          habitat/tests/test.ps1
diff --git a/.github/workflows/habitat-publish.yml b/.github/workflows/habitat-publish.yml
index d87e2463..1b821909 100644
--- a/.github/workflows/habitat-publish.yml
+++ b/.github/workflows/habitat-publish.yml
@@ -11,7 +11,7 @@ on:
 env:
   # BLDR URL Defined as: 'https://bldr.habitat.sh/' but as an env var in workspace settings. 
   BLDR_URL: ${{vars.BLDR_URL}}
-   # HAB_ORIGIN Defined as: 'chef-platform' defined in workspace settings.
+   # HAB_ORIGIN Defined as: 'chef' defined in workspace settings.
   HAB_ORIGIN: ${{vars.HAB_ORIGIN}}
   # BLDR_CHANNEL defaulted to unstable, but can be switched to stable, it is defined via the environment setting https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#using-an-environment
   BLDR_CHANNEL: ${{ vars.BLDR_CHANNEL }}
@@ -110,4 +110,3 @@ jobs:
           . results\last_build.ps1
           hab pkg upload results\$pkg_artifact --auth ${{ secrets.HAB_AUTH_TOKEN }}
           write-output "--- push complete!!"
-          outreach
diff --git a/habitat/tests/test.pester.ps1 b/habitat/tests/test.pester.ps1
new file mode 100644
index 00000000..65431ef6
--- /dev/null
+++ b/habitat/tests/test.pester.ps1
@@ -0,0 +1,33 @@
+param(
+    [Parameter()]
+    [string]$PackageIdentifier = $(throw "Usage: test.ps1 [test_pkg_ident] e.g. test.ps1 ci/user-windows-default/1.0.0/20190812103929")
+)
+
+$PackageVersion = $PackageIdentifier.split('/')[2]
+
+Describe "cookstyle" {
+    Context "cookstyle" {
+        It "is an executable" {
+            hab pkg exec $PackageIdentifier cookstyle.bat --version
+            $? | Should be $true
+        }
+
+        <#
+          At some point hab's argument parsing changed and it started interpreting the trailing `--version` as being
+          an argument passed to hab instead of an argument to the command passed to `hab pkg exec`.
+
+          Powershell 5.1 and 7 appear to differ in how they treat following arguments as well, such that these two
+          versions of the command fail in powershell 5.1 (which is currently what is running in the windows machines
+          in Buildkite) but pass in powershell 7 (which is currently what is running in a stock Windows 10 VM).
+
+          $the_version = (hab pkg exec $PackageIdentifier cookstyle.bat '--version' | Out-String).split(':')[1].Trim()
+          $the_version = (hab pkg exec $PackageIdentifier cookstyle.bat --version | Out-String).split(':')[1].Trim()
+
+          This version of the command passes in powershell 5.1 but fails in powershell 7.
+        #>
+        It "is the expected version" {
+            $the_version = (hab pkg exec $PackageIdentifier cookstyle.bat -- --version | Out-String).split(':')[1].Trim()
+            $the_version | Should be $PackageVersion
+        }
+    }
+}
\ No newline at end of file
diff --git a/habitat/tests/test.ps1 b/habitat/tests/test.ps1
new file mode 100644
index 00000000..682fdfbb
--- /dev/null
+++ b/habitat/tests/test.ps1
@@ -0,0 +1,19 @@
+param (
+    [Parameter()]
+    [string]$PackageIdentifier = $(throw "Usage: test.ps1 [test_pkg_ident] e.g. test.ps1 ci/user-windows/1.0.0/20190812103929")
+)
+
+# ensure Pester is available for test use
+if (-Not (Get-Module -ListAvailable -Name Pester)){
+    hab pkg install core/pester
+    Import-Module "$(hab pkg path core/pester)\module\pester.psd1"
+}
+
+Write-Host "--- :fire: Smokish Pestering"
+# Pester the Package
+$__dir=(Get-Item $PSScriptRoot)
+$test_result = Invoke-Pester -Strict -PassThru -Script @{
+    Path = "habitat/tests/test.pester.ps1";
+    Parameters = @{PackageIdentifier=$PackageIdentifier}
+}
+if ($test_result.FailedCount -ne 0) { Exit $test_result.FailedCount }
\ No newline at end of file
diff --git a/habitat/tests/test.sh b/habitat/tests/test.sh
new file mode 100644
index 00000000..763f347e
--- /dev/null
+++ b/habitat/tests/test.sh
@@ -0,0 +1,24 @@
+
+set -euo pipefail
+
+
+project_root="$(git rev-parse --show-toplevel)"
+
+# print error message followed by usage and exit
+error () {
+  local message="$1"
+
+  echo -e "\nERROR: ${message}\n" >&2
+
+  exit 1
+}
+
+[[ -n "$pkg_ident" ]] || error 'no hab package identity provided'
+
+package_version=$(awk -F / '{print $3}' <<<"$pkg_ident")
+
+cd "${project_root}"
+
+echo "--- :mag_right: Testing ${pkg_ident} executables"
+actual_version=$(hab pkg exec "${pkg_ident}" cookstyle -v | sed -E 's/.*version: ([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
+[[ "$package_version" = "$actual_version" ]] || error "cookstyle version is not the expected version. Expected '$package_version', got '$actual_version'"
\ No newline at end of file

From 8773008c6cd17e7a95bbfe7405aa4e1d4aea44e0 Mon Sep 17 00:00:00 2001
From: nikhil2611 <nikhilgupta2102@gmail.com>
Date: Mon, 2 Dec 2024 17:50:09 +0530
Subject: [PATCH 03/10] fixing for windows

Signed-off-by: nikhil2611 <nikhilgupta2102@gmail.com>
---
 .github/workflows/habitat-build.yml |  7 +++---
 habitat/tests/test.pester.ps1       | 33 -----------------------------
 habitat/tests/test.ps1              | 14 +++++++-----
 3 files changed, 13 insertions(+), 41 deletions(-)
 delete mode 100644 habitat/tests/test.pester.ps1

diff --git a/.github/workflows/habitat-build.yml b/.github/workflows/habitat-build.yml
index 7a05750c..098030b0 100644
--- a/.github/workflows/habitat-build.yml
+++ b/.github/workflows/habitat-build.yml
@@ -98,6 +98,7 @@ jobs:
         run: |
           write-output "--- STARTING HAB INSTALL ON ${{ matrix.os }} WINDOWS with habitat version:${{vars.HABITAT_VERSION_SET}}"
           $env:HAB_LICENSE = "accept-no-persist"
+          $env:HAB_NONINTERACTIVE = "true"
           $env:HAB_FALLBACK_CHANNEL= "${{vars.HAB_FALLBACK_CHANNEL}}"
           Invoke-Expression "& { $(Invoke-RestMethod https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1) } -Version ${{vars.HABITAT_VERSION_SET}}"
       - name: run habitat packaging windows
@@ -110,7 +111,7 @@ jobs:
           hab origin key download --auth ${{ secrets.HAB_AUTH_TOKEN }} --secret ${{ env.HAB_ORIGIN }}
           write-output "--- running windows hab build"
           hab pkg build .
-          hartfile=$(ls ./results | grep "cookstyle" | tail -n 1)
+          $hartfile=(ls ./results -Name | findstr "cookstyle")
           hab pkg install ./results/$hartfile
-          . ./results/last_build.env
-          habitat/tests/test.ps1
+          . ./results/last_build.ps1
+          habitat/tests/test.ps1 $pkg_ident
diff --git a/habitat/tests/test.pester.ps1 b/habitat/tests/test.pester.ps1
deleted file mode 100644
index 65431ef6..00000000
--- a/habitat/tests/test.pester.ps1
+++ /dev/null
@@ -1,33 +0,0 @@
-param(
-    [Parameter()]
-    [string]$PackageIdentifier = $(throw "Usage: test.ps1 [test_pkg_ident] e.g. test.ps1 ci/user-windows-default/1.0.0/20190812103929")
-)
-
-$PackageVersion = $PackageIdentifier.split('/')[2]
-
-Describe "cookstyle" {
-    Context "cookstyle" {
-        It "is an executable" {
-            hab pkg exec $PackageIdentifier cookstyle.bat --version
-            $? | Should be $true
-        }
-
-        <#
-          At some point hab's argument parsing changed and it started interpreting the trailing `--version` as being
-          an argument passed to hab instead of an argument to the command passed to `hab pkg exec`.
-
-          Powershell 5.1 and 7 appear to differ in how they treat following arguments as well, such that these two
-          versions of the command fail in powershell 5.1 (which is currently what is running in the windows machines
-          in Buildkite) but pass in powershell 7 (which is currently what is running in a stock Windows 10 VM).
-
-          $the_version = (hab pkg exec $PackageIdentifier cookstyle.bat '--version' | Out-String).split(':')[1].Trim()
-          $the_version = (hab pkg exec $PackageIdentifier cookstyle.bat --version | Out-String).split(':')[1].Trim()
-
-          This version of the command passes in powershell 5.1 but fails in powershell 7.
-        #>
-        It "is the expected version" {
-            $the_version = (hab pkg exec $PackageIdentifier cookstyle.bat -- --version | Out-String).split(':')[1].Trim()
-            $the_version | Should be $PackageVersion
-        }
-    }
-}
\ No newline at end of file
diff --git a/habitat/tests/test.ps1 b/habitat/tests/test.ps1
index 682fdfbb..e9c30dfa 100644
--- a/habitat/tests/test.ps1
+++ b/habitat/tests/test.ps1
@@ -11,9 +11,13 @@ if (-Not (Get-Module -ListAvailable -Name Pester)){
 
 Write-Host "--- :fire: Smokish Pestering"
 # Pester the Package
-$__dir=(Get-Item $PSScriptRoot)
-$test_result = Invoke-Pester -Strict -PassThru -Script @{
-    Path = "habitat/tests/test.pester.ps1";
-    Parameters = @{PackageIdentifier=$PackageIdentifier}
+$version=hab pkg exec "${pkg_ident}" cookstyle -v
+$actual_version=[Regex]::Match($version,"([0-9]+.[0-9]+.[0-9]+)").Value
+$package_version=$PackageIdentifier.split("/",4)[2]
+if ($package_version -eq $actual_version)
+{
+    Write "cookstyle working fine"
 }
-if ($test_result.FailedCount -ne 0) { Exit $test_result.FailedCount }
\ No newline at end of file
+else {
+    Write-Error "cookstyle version not met expected $package_version actual version $actual_version "
+}
\ No newline at end of file

From dd814bbd8567be5e43cac30cc8b4c2f740d44552 Mon Sep 17 00:00:00 2001
From: nikhil2611 <nikhilgupta2102@gmail.com>
Date: Tue, 3 Dec 2024 16:11:26 +0530
Subject: [PATCH 04/10] fixing the version test

Signed-off-by: nikhil2611 <nikhilgupta2102@gmail.com>
---
 habitat/tests/test.ps1 | 7 +------
 habitat/tests/test.sh  | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/habitat/tests/test.ps1 b/habitat/tests/test.ps1
index e9c30dfa..f143640f 100644
--- a/habitat/tests/test.ps1
+++ b/habitat/tests/test.ps1
@@ -3,13 +3,8 @@ param (
     [string]$PackageIdentifier = $(throw "Usage: test.ps1 [test_pkg_ident] e.g. test.ps1 ci/user-windows/1.0.0/20190812103929")
 )
 
-# ensure Pester is available for test use
-if (-Not (Get-Module -ListAvailable -Name Pester)){
-    hab pkg install core/pester
-    Import-Module "$(hab pkg path core/pester)\module\pester.psd1"
-}
 
-Write-Host "--- :fire: Smokish Pestering"
+Write-Host "--- :fire: Smokish test"
 # Pester the Package
 $version=hab pkg exec "${pkg_ident}" cookstyle -v
 $actual_version=[Regex]::Match($version,"([0-9]+.[0-9]+.[0-9]+)").Value
diff --git a/habitat/tests/test.sh b/habitat/tests/test.sh
index 763f347e..53f710ee 100644
--- a/habitat/tests/test.sh
+++ b/habitat/tests/test.sh
@@ -19,6 +19,6 @@ package_version=$(awk -F / '{print $3}' <<<"$pkg_ident")
 
 cd "${project_root}"
 
-echo "--- :mag_right: Testing ${pkg_ident} executables"
-actual_version=$(hab pkg exec "${pkg_ident}" cookstyle -v | sed -E 's/.*version: ([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
+echo "--- :msg_right: Testing ${pkg_ident} executables"
+actual_version=$(hab pkg exec "${pkg_ident}" cookstyle -v | sed -n 's/^Cookstyle \([0-9.]*\).*$/\1/p'
 [[ "$package_version" = "$actual_version" ]] || error "cookstyle version is not the expected version. Expected '$package_version', got '$actual_version'"
\ No newline at end of file

From 588939cd6525eec0c9901eba4fa2b0a132c69a22 Mon Sep 17 00:00:00 2001
From: nikhil2611 <nikhilgupta2102@gmail.com>
Date: Tue, 3 Dec 2024 16:15:25 +0530
Subject: [PATCH 05/10] fixing the bracket error

Signed-off-by: nikhil2611 <nikhilgupta2102@gmail.com>
---
 habitat/tests/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/habitat/tests/test.sh b/habitat/tests/test.sh
index 53f710ee..551afd29 100644
--- a/habitat/tests/test.sh
+++ b/habitat/tests/test.sh
@@ -20,5 +20,5 @@ package_version=$(awk -F / '{print $3}' <<<"$pkg_ident")
 cd "${project_root}"
 
 echo "--- :msg_right: Testing ${pkg_ident} executables"
-actual_version=$(hab pkg exec "${pkg_ident}" cookstyle -v | sed -n 's/^Cookstyle \([0-9.]*\).*$/\1/p'
+actual_version=$(hab pkg exec "${pkg_ident}" cookstyle -v | sed -n 's/^Cookstyle \([0-9.]*\).*$/\1/p')
 [[ "$package_version" = "$actual_version" ]] || error "cookstyle version is not the expected version. Expected '$package_version', got '$actual_version'"
\ No newline at end of file

From e4625de65d0b3fcbaae936160fccf19c3d0c5668 Mon Sep 17 00:00:00 2001
From: nikhil2611 <nikhilgupta2102@gmail.com>
Date: Tue, 3 Dec 2024 17:11:34 +0530
Subject: [PATCH 06/10] updated the plan file for linux

Signed-off-by: nikhil2611 <nikhilgupta2102@gmail.com>
---
 habitat/plan.sh | 134 ++++++++++++++++++------------------------------
 1 file changed, 49 insertions(+), 85 deletions(-)

diff --git a/habitat/plan.sh b/habitat/plan.sh
index c0bf94b2..e61ee5a2 100644
--- a/habitat/plan.sh
+++ b/habitat/plan.sh
@@ -1,6 +1,8 @@
-_chef_client_ruby="core/ruby31"
+export HAB_BLDR_CHANNEL="LTS-2024"
+_chef_client_ruby="core/ruby3_1"
 pkg_name="cookstyle"
-pkg_origin=ngupta26
+pkg_origin="ngupta26"
+pkg_maintainer="The Chef Maintainers <humans@chef.io>"
 pkg_description="Chef Cookstyle - Chef Infra Cookbook and InSpec profile linting with autocorrection."
 pkg_license=('Apache-2.0')
 pkg_bin_dirs=(
@@ -9,117 +11,79 @@ pkg_bin_dirs=(
 )
 pkg_build_deps=(
   core/make
+  core/bash
   core/gcc
-  core/git
-  core/libarchive
 )
 pkg_deps=(
   $_chef_client_ruby
   core/coreutils
+  core/git
 )
 pkg_svc_user=root
 
 pkg_version() {
-  cat "${SRC_PATH}/VERSION"
+  cat "$SRC_PATH/VERSION"
 }
 
 do_before() {
-  do_default_before
   update_pkg_version
-  # We must wait until we update the pkg_version to use the pkg_version
-  pkg_filename="${pkg_name}-${pkg_version}.tar.gz"
-}
-
-do_download() {
-  build_line "Locally creating archive of latest repository commit at ${HAB_CACHE_SRC_PATH}/${pkg_filename}"
-  # source is in this repo, so we're going to create an archive from the
-  # appropriate path within the repo and place the generated tarball in the
-  # location expected by do_unpack
-  ( cd "${SRC_PATH}" || exit_with "unable to enter hab-src directory" 1
-    git archive --prefix="${pkg_name}-${pkg_version}/" --output="${HAB_CACHE_SRC_PATH}/${pkg_filename}" HEAD
-  )
 }
 
-do_verify() {
-  build_line "Skipping checksum verification on the archive we just created."
-  return 0
+do_unpack() {
+  mkdir -pv "$HAB_CACHE_SRC_PATH/$pkg_dirname"
+  cp -RT "$PLAN_CONTEXT"/.. "$HAB_CACHE_SRC_PATH/$pkg_dirname/"
 }
 
-# Setup environment variables for Ruby Gems
-do_setup_environment() {
-  push_runtime_env GEM_PATH "${pkg_prefix}/vendor"
-
-  set_runtime_env APPBUNDLER_ALLOW_RVM "true" # prevent appbundler from clearing out the carefully constructed runtime GEM_PATH
-  set_runtime_env LANG "en_US.UTF-8"
-  set_runtime_env LC_CTYPE "en_US.UTF-8"
+do_build() {
+  echo $(pkg_path_for $_chef_client_ruby)
+  export GEM_HOME="$pkg_prefix/vendor/gems"
+
+  build_line "Setting GEM_PATH=$GEM_HOME"
+  export GEM_PATH="$GEM_HOME"
+  bundle config --local without integration deploy maintenance
+  bundle config --local jobs 4
+  bundle config --local retry 5
+  bundle config --local silence_root_warning 1
+  bundle install
+  gem build cookstyle.gemspec
 }
 
-do_prepare() {
-  export GEM_HOME="${pkg_prefix}/vendor"
-  export CPPFLAGS="${CPPFLAGS} ${CFLAGS}"
-
-  ( cd "$CACHE_PATH"
-    bundle config --local jobs "$(nproc)"
-    bundle config --local without server docgen maintenance pry travis integration ci chefstyle
-    bundle config --local shebang "$(pkg_path_for "$_chef_client_ruby")/bin/ruby"
-    bundle config --local retry 5
-    bundle config --local silence_root_warning 1
-  )
+do_install() {
+  export GEM_HOME="$pkg_prefix/vendor/gems"
 
-  build_line "Setting link for /usr/bin/env to 'coreutils'"
-  if [ ! -f /usr/bin/env ]; then
-    ln -s "$(pkg_interpreter_for core/coreutils bin/env)" /usr/bin/env
-  fi
+  build_line "Setting GEM_PATH=$GEM_HOME"
+  export GEM_PATH="$GEM_HOME"
+  gem install cookstyle-*.gem --no-document
+  wrap_ruby_cookstyle
+  set_runtime_env "GEM_PATH" "${pkg_prefix}/vendor/gems"
 }
 
-# Build the gem from the gemspec file
-do_build() {
-  ( cd "$CACHE_PATH" || exit_with "unable to enter hab-cache directory" 1
-    build_line "Installing gem dependencies ..."
-    bundle install --jobs=3 --retry=3
-    build_line "Installing gems from git repos properly ..."
-    build_line "Installing this project's gems ..."
-    bundle exec rake install:local
-    gem install chef-utils chef-config appbundler
-  )
+wrap_ruby_cookstyle() {
+  local bin="$pkg_prefix/bin/cookstyle"
+  local real_bin="$GEM_HOME/gems/cookstyle-${pkg_version}/bin/cookstyle"
+  wrap_bin_with_ruby "$bin" "$real_bin"
 }
 
-# Install the built gem into the package directory
-do_install() {
-  ( cd "$pkg_prefix" || exit_with "unable to enter pkg prefix directory" 1
-    export BUNDLE_GEMFILE="${CACHE_PATH}/Gemfile"
-    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 cookstyle; do
-      build_line "** generating binstubs for $gem with precise version pins"
-      appbundler $CACHE_PATH $pkg_prefix/bin $gem
-    done
-  )
-}
+wrap_bin_with_ruby() {
+  local bin="$1"
+  local real_bin="$2"
+  build_line "Adding wrapper $bin to $real_bin"
+  cat <<EOF > "$bin"
+#!$(pkg_path_for core/bash)/bin/bash
+set -e
 
-do_after() {
-  build_line "Trimming the fat ..."
+# Set binary path that allows cookstyle to use non-Hab pkg binaries
+export PATH="/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:\$PATH"
 
-  # We don't need the cache of downloaded .gem files ...
-  rm -rf "$pkg_prefix/vendor/cache"
+# Set Ruby paths defined from 'do_setup_environment()'
+export GEM_HOME="$pkg_prefix/vendor/gems"
+export GEM_PATH="\$GEM_HOME"
 
-  # We don't need the gem docs.
-  rm -rf "$pkg_prefix/vendor/doc"
-  # We don't need to ship the test suites for every gem dependency,
-  # only Chef's for package verification.
-  find "$pkg_prefix/vendor/gems" -name spec -type d | grep -v "cookstyle-${pkg_version}" \
-      | while read spec_dir; do rm -rf "$spec_dir"; done
+exec $(pkg_path_for $_chef_client_ruby)/bin/ruby $real_bin \$@
+EOF
+  chmod -v 755 "$bin"
 }
 
-do_end() {
-  if [ "$(readlink /usr/bin/env)" = "$(pkg_interpreter_for core/coreutils bin/env)" ]; then
-    build_line "Removing the symlink we created for '/usr/bin/env'"
-    rm /usr/bin/env
-  fi
-}
-
-# No additional stripping needed
 do_strip() {
   return 0
-}
\ No newline at end of file
+}

From 957e3c40251b09cf0144c3960851982e27fe6b3b Mon Sep 17 00:00:00 2001
From: nikhil2611 <nikhilgupta2102@gmail.com>
Date: Tue, 3 Dec 2024 17:29:14 +0530
Subject: [PATCH 07/10] updated the plan file for win

Signed-off-by: nikhil2611 <nikhilgupta2102@gmail.com>
---
 habitat/plan.ps1       | 3 +--
 habitat/tests/test.ps1 | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/habitat/plan.ps1 b/habitat/plan.ps1
index 71c1756f..ff7038a0 100644
--- a/habitat/plan.ps1
+++ b/habitat/plan.ps1
@@ -1,6 +1,7 @@
 $ErrorActionPreference = "Stop"
 $PSDefaultParameterValues['*:ErrorAction']='Stop'
 
+$env:HAB_BLDR_CHANNEL = "LTS-2024"
 $pkg_name="cookstyle"
 $pkg_origin="chef"
 $pkg_version=$(Get-Content "$PLAN_CONTEXT/../VERSION")
@@ -21,7 +22,6 @@ function pkg_version {
 function Invoke-Before {
     Set-PkgVersion
 }
-
 function Invoke-SetupEnvironment {
     Push-RuntimeEnv -IsPath GEM_PATH "$pkg_prefix/vendor"
 
@@ -48,7 +48,6 @@ function Invoke-Build {
         gem build cookstyle.gemspec
 	    Write-BuildLine " ** Using gem to  install"
 	    gem install cookstyle-*.gem --no-document
-        
 
         If ($lastexitcode -ne 0) { Exit $lastexitcode }
     } finally {
diff --git a/habitat/tests/test.ps1 b/habitat/tests/test.ps1
index f143640f..3d07690f 100644
--- a/habitat/tests/test.ps1
+++ b/habitat/tests/test.ps1
@@ -9,6 +9,8 @@ Write-Host "--- :fire: Smokish test"
 $version=hab pkg exec "${pkg_ident}" cookstyle -v
 $actual_version=[Regex]::Match($version,"([0-9]+.[0-9]+.[0-9]+)").Value
 $package_version=$PackageIdentifier.split("/",4)[2]
+
+Write-Host "package_version  $package_version actual version $actual_version"
 if ($package_version -eq $actual_version)
 {
     Write "cookstyle working fine"

From d44595586391baafe4fa793584136158fe96bd3c Mon Sep 17 00:00:00 2001
From: nikhil2611 <nikhilgupta2102@gmail.com>
Date: Tue, 3 Dec 2024 17:57:45 +0530
Subject: [PATCH 08/10] updated the origin

Signed-off-by: nikhil2611 <nikhilgupta2102@gmail.com>
---
 habitat/plan.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/habitat/plan.sh b/habitat/plan.sh
index e61ee5a2..4009ddbf 100644
--- a/habitat/plan.sh
+++ b/habitat/plan.sh
@@ -1,7 +1,7 @@
 export HAB_BLDR_CHANNEL="LTS-2024"
 _chef_client_ruby="core/ruby3_1"
 pkg_name="cookstyle"
-pkg_origin="ngupta26"
+pkg_origin="chef"
 pkg_maintainer="The Chef Maintainers <humans@chef.io>"
 pkg_description="Chef Cookstyle - Chef Infra Cookbook and InSpec profile linting with autocorrection."
 pkg_license=('Apache-2.0')

From 8bb6e8b44debf858faa3f9504106b46fc9a97f9a Mon Sep 17 00:00:00 2001
From: nikhil2611 <nikhilgupta2102@gmail.com>
Date: Thu, 5 Dec 2024 16:13:12 +0530
Subject: [PATCH 09/10] updated the pipeline to work with expeditor

Signed-off-by: nikhil2611 <nikhilgupta2102@gmail.com>
---
 .expeditor/build.habitat.yml                  |   9 ++
 .../buildkite/artifact.habitat.test.ps1       |  86 +++++++++++++
 .expeditor/buildkite/artifact.habitat.test.sh |  71 +++++++++++
 .expeditor/config.yml                         |  43 ++++++-
 .expeditor/habitat-test.pipeline.yml          |  35 ++++++
 .github/workflows/habitat-build.yml           | 117 ------------------
 .github/workflows/habitat-publish.yml         | 112 -----------------
 habitat/tests/test.ps1                        |   1 +
 8 files changed, 243 insertions(+), 231 deletions(-)
 create mode 100644 .expeditor/build.habitat.yml
 create mode 100644 .expeditor/buildkite/artifact.habitat.test.ps1
 create mode 100644 .expeditor/buildkite/artifact.habitat.test.sh
 create mode 100644 .expeditor/habitat-test.pipeline.yml
 delete mode 100644 .github/workflows/habitat-build.yml
 delete mode 100644 .github/workflows/habitat-publish.yml

diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml
new file mode 100644
index 00000000..9c2d3d7a
--- /dev/null
+++ b/.expeditor/build.habitat.yml
@@ -0,0 +1,9 @@
+---
+origin: chef
+
+expeditor:
+  defaults:
+    buildkite:
+      retry:
+        automatic:
+          limit: 1
\ No newline at end of file
diff --git a/.expeditor/buildkite/artifact.habitat.test.ps1 b/.expeditor/buildkite/artifact.habitat.test.ps1
new file mode 100644
index 00000000..058c5984
--- /dev/null
+++ b/.expeditor/buildkite/artifact.habitat.test.ps1
@@ -0,0 +1,86 @@
+#!/usr/bin/env powershell
+
+#Requires -Version 5
+# https://stackoverflow.com/questions/9948517
+# TODO: Set-StrictMode -Version Latest
+$PSDefaultParameterValues['*:ErrorAction']='Stop'
+$ErrorActionPreference = 'Stop'
+$env:HAB_BLDR_CHANNEL = "LTS-2024"
+$env:HAB_ORIGIN = 'ci'
+$env:CHEF_LICENSE = 'accept-no-persist'
+$env:HAB_LICENSE = 'accept-no-persist'
+$Plan = 'cookstyle'
+
+Write-Host "--- system details"
+$Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
+Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize
+
+Write-Host "--- Installing the version of Habitat required"
+
+function Stop-HabProcess {
+  $habProcess = Get-Process hab -ErrorAction SilentlyContinue
+  if ($habProcess) {
+      Write-Host "Stopping hab process..."
+      Stop-Process -Name hab -Force
+  }
+}
+
+# Installing Habitat
+function Install-Habitat {
+  Write-Host "Downloading and installing Habitat..."
+  Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1'))
+}
+
+try {
+  hab --version
+}
+catch {
+  Set-ExecutionPolicy Bypass -Scope Process -Force
+
+  Stop-HabProcess
+
+  # Remove the existing hab.exe if it exists and if you have permissions
+  $habPath = "C:\ProgramData\Habitat\hab.exe"
+  if (Test-Path $habPath) {
+      Write-Host "Attempting to remove existing hab.exe..."
+      Remove-Item $habPath -Force -ErrorAction SilentlyContinue
+      if (Test-Path $habPath) {
+          Write-Host "Failed to remove hab.exe, re-running script with elevated permissions."
+          Start-Process powershell -Verb runAs -ArgumentList "-NoProfile -ExecutionPolicy Bypass -File `"$PSCommandPath`""
+          exit
+      }
+  }
+
+  Install-Habitat
+}
+finally {
+  Write-Host ":habicat: I think I have the version I need to build."
+}
+
+
+Write-Host "--- Generating fake origin key"
+hab origin key generate $env:HAB_ORIGIN
+
+Write-Host "--- Building $Plan"
+$project_root = "$(git rev-parse --show-toplevel)"
+Set-Location $project_root
+
+$env:DO_CHECK=$true; hab pkg build .
+
+. $project_root/results/last_build.ps1
+
+Write-Host "--- Installing $pkg_ident/$pkg_artifact"
+hab pkg install -b $project_root/results/$pkg_artifact
+
+Write-Host "+++ Testing $Plan"
+
+Push-Location $project_root
+
+try {
+    Write-Host "Running unit tests..."
+    habitat/tests/test.ps1 $pkg_ident
+}
+finally {
+    # Ensure we always return to the original directory
+    Pop-Location
+}
\ No newline at end of file
diff --git a/.expeditor/buildkite/artifact.habitat.test.sh b/.expeditor/buildkite/artifact.habitat.test.sh
new file mode 100644
index 00000000..80e1ad08
--- /dev/null
+++ b/.expeditor/buildkite/artifact.habitat.test.sh
@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+export HAB_ORIGIN='ci'
+export PLAN='cookstyle'
+export CHEF_LICENSE="accept-no-persist"
+export HAB_LICENSE="accept-no-persist"
+export HAB_BLDR_CHANNEL="LTS-2024"
+
+echo "--- checking if git is installed"
+if ! command -v git &> /dev/null; then
+    echo "Git is not installed. Installing Git..."
+    sudo yum install -y git
+else
+    echo "Git is already installed."
+    git --version
+fi
+
+echo "--- add an exception for this directory since detected dubious ownership in repository at /workdir"
+git config --global --add safe.directory /workdir
+
+echo "--- git status for this workdir"
+git status
+
+echo "--- ruby version"
+ruby -v
+
+export project_root="$(git rev-parse --show-toplevel)"
+echo "The value for project_root is: $project_root"
+
+export HAB_NONINTERACTIVE=true
+export HAB_NOCOLORING=true
+export HAB_STUDIO_SECRET_HAB_NONINTERACTIVE=true
+
+echo "--- system details"
+uname -a
+
+echo "--- Installing Habitat"
+id -a
+curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | bash
+
+echo "--- :key: Generating fake origin key"
+hab origin key generate "$HAB_ORIGIN"
+
+
+echo "--- Building $PLAN"
+cd "$project_root"
+DO_CHECK=true hab pkg build .
+
+echo "--- Sourcing 'results/last_build.sh'"
+if [ -f ./results/last_build.env ]; then
+    cat ./results/last_build.env
+    . ./results/last_build.env
+    export pkg_artifact
+fi
+
+echo "+++ Installing ${pkg_ident:?is undefined}"
+echo "++++"
+echo $project_root
+echo "+++"
+hab pkg install -b "${project_root:?is undefined}/results/${pkg_artifact:?is undefined}"
+
+echo "+++ Testing $PLAN"
+
+PATH="$(hab pkg path ci/cookstyle)/bin:$PATH"
+export PATH
+echo "PATH is $PATH"
+
+echo "--- :mag_right: Testing $PLAN"
+${project_root}/habitat/tests/test.sh "$pkg_ident" || error 'failures during test of executables'
\ No newline at end of file
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index c71d963e..7afff562 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -3,12 +3,18 @@
 
 # Slack channel in Chef Software slack to send notifications about build failures, etc
 slack:
-  notify_channel: chef-infra-notify
+  notify_channel: chef-ws-notify
 
 # This publish is triggered by the `built_in:publish_rubygems` artifact_action.
 rubygems:
   - cookstyle
 
+release_branches:
+  - workstation-LTS:
+      version_constraint: 7.*
+  - main:
+      version_constraint: 7.*
+
 github:
   # This deletes the GitHub PR branch after successfully merged into the release branch
   delete_branch_on_merge: true
@@ -24,6 +30,24 @@ github:
 changelog:
   rollup_header: Changes not yet released to rubygems.org
 
+pipelines:
+  - verify:
+      description: Pull Request validation tests
+      public: true
+  - habitat/build:
+      env:
+        - HAB_NONINTERACTIVE: "true"
+        - HAB_NOCOLORING: "true"
+        - HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true"
+  - habitat/test:
+      description: Execute tests against the habitat artifact
+      definition: .expeditor/habitat-test.pipeline.yml
+      env:
+        - HAB_NONINTERACTIVE: "true"
+        - HAB_NOCOLORING: "true"
+        - HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true"
+      trigger: pull_request
+
 subscriptions:
   # These actions are taken, in order they are specified, anytime a Pull Request is merged.
   - workload: pull_request_merged:{{github_repo}}:{{release_branch}}:*
@@ -41,8 +65,23 @@ subscriptions:
             - "Expeditor: Skip All"
       - built_in:build_gem:
           only_if: built_in:bump_version
+      - trigger_pipeline:habitat/test:
+          only_if: built_in:bump_version
+          ignore_labels:
+            - "Expeditor: Skip Habitat"
+            - "Expeditor: Skip All"
+      - trigger_pipeline:habitat/build:
+          only_if: built_in:bump_version
+          ignore_labels:
+            - "Expeditor: Skip Habitat"
+            - "Expeditor: Skip All"
 
   - workload: project_promoted:{{agent_id}}:*
     actions:
       - built_in:rollover_changelog
-      - built_in:publish_rubygems
\ No newline at end of file
+      - built_in:publish_rubygems
+    # the habitat chain
+  - workload: buildkite_hab_build_group_published:{{agent_id}}:*
+    actions:
+      # when all of the hab package publish to the unstable channel, test and promote them
+      - trigger_pipeline:habitat/test
diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml
new file mode 100644
index 00000000..7cd46985
--- /dev/null
+++ b/.expeditor/habitat-test.pipeline.yml
@@ -0,0 +1,35 @@
+---
+expeditor:
+  defaults:
+    buildkite:
+      timeout_in_minutes: 30
+      retry:
+        automatic:
+          limit: 1
+
+steps:
+
+  - label: ":linux: Validate Habitat Builds of Chef-cli"
+    commands:
+      - .expeditor/buildkite/artifact.habitat.test.sh
+    expeditor:
+      executor:
+        docker:
+          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/
diff --git a/.github/workflows/habitat-build.yml b/.github/workflows/habitat-build.yml
deleted file mode 100644
index 098030b0..00000000
--- a/.github/workflows/habitat-build.yml
+++ /dev/null
@@ -1,117 +0,0 @@
-name: Build Habitat packages
-      
-on:
-  push:
-    branches:
-      - workstation-LTS
-  pull_request:
-    branches:
-      - workstation-LTS
-
-env:
-  # BLDR URL Defined as: 'https://bldr.habitat.sh/' but as an env var in workspace settings. 
-  BLDR_URL: ${{vars.BLDR_URL}}
-   # HAB_ORIGIN Defined as: 'chef' defined in workspace settings.
-  HAB_ORIGIN: ${{vars.HAB_ORIGIN}}
-  # BLDR_CHANNEL defaulted to unstable, but can be switched to stable, it is defined via the environment setting https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#using-an-environment
-  BLDR_CHANNEL: ${{ vars.BLDR_CHANNEL }}
-  # HABITAT_VERSION_SET this is the version of habitat CLI you are using, defaults to latest.
-  HABITAT_VERSION_SET: ${{vars.HABITAT_VERSION_SET}}
-  # HAB_AUTH_TOKEN your orgs/projects auth token value
-  HAB_AUTH_TOKEN: ${{ secrets.HAB_AUTH_TOKEN }}
-  # HABITAT_TARGET this is the CPU arch for the linux CLI tool, its defaulted to x86_64
-  #HABITAT_TARGET: $#{{vars.HABITAT_TARGET}}
-  HAB_FALLBACK_CHANNEL: ${{vars.HAB_FALLBACK_CHANNEL}}
-
-permissions:
-  contents: write
-
-jobs:
-  pre-build:
-    name: Setup before building packages
-    runs-on: ubuntu-latest
-    outputs:
-      app_version: ${{ steps.app_version.outputs.APP_VERSION }}
-    steps:
-      - name: Get branch name
-        id: get_branch_name
-        run: |
-          echo "BRANCH_NAME=${GITHUB_REF_NAME//\//-}" >> "$GITHUB_OUTPUT"
-      - name: Get version from tag
-        id: app_version
-        run: |
-          echo "APP_VERSION=${{ github.ref_type == 'tag' && github.ref_name || format('{0}-{1}', steps.get_branch_name.outputs.BRANCH_NAME, github.sha) }}" >> "$GITHUB_OUTPUT"
-  agent-matrix:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-      # matrix strategy is described at https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
-
-    runs-on: ${{ matrix.os }}
-    # free runner types are https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
-    # from macos-latest, windows-latest, ubuntu-latest, ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016
-    # included software packages on runners are at https://github.com/actions/runner-images#available-images 
-    # defaulted to unstable, but can be switched to stable, it is defined via the environment setting https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#using-an-environment
-    # environment: unstable 
-    steps:
-      - name: print OS
-        run: echo "--- ${{ matrix.os }}"
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-
-      - name: install habitat on Linux
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        shell: bash
-        run: |
-          echo "--- STARTING HAB INSTALL ON  ${{ matrix.os }} UBUNTU with habitat version:${{vars.HABITAT_VERSION_SET}}"
-          export HABITAT_VERSION="${{vars.HABITAT_VERSION_SET}}"
-          export HAB_FALLBACK_CHANNEL="${{vars.HAB_FALLBACK_CHANNEL}}"
-          HABITAT_VERSION="${HABITAT_VERSION:?HABITAT_VERSION must be set}"
-          HABITAT_TARGET="${HABITAT_TARGET:-x86_64-linux}"
-          curl https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh | sudo bash -s -- -v "$HABITAT_VERSION" -t "$HABITAT_TARGET"
-      - name: run Habitat packaging (linux)
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        shell: bash
-        run: |
-          hab license accept
-          hab origin key download $HAB_ORIGIN
-          hab origin key download --auth $HAB_AUTH_TOKEN --secret $HAB_ORIGIN
-          echo "--- running linux hab build"
-          hab pkg build .
-          hartfile=$(ls ./results | grep "cookstyle" | tail -n 1)
-          sudo hab license accept
-          export CHEF_LICENSE="accept-no-persist"
-          export HAB_LICENSE="accept-no-persist"
-          export HAB_NONINTERACTIVE="true"
-          sudo hab pkg install ./results/$hartfile
-          . ./results/last_build.env
-          export pkg_ident
-          chmod +x habitat/tests/test.sh
-          habitat/tests/test.sh
-      - name: Install Habitat on Windows
-        if: ${{ matrix.os == 'windows-latest' }}
-        shell: pwsh
-        run: |
-          write-output "--- STARTING HAB INSTALL ON ${{ matrix.os }} WINDOWS with habitat version:${{vars.HABITAT_VERSION_SET}}"
-          $env:HAB_LICENSE = "accept-no-persist"
-          $env:HAB_NONINTERACTIVE = "true"
-          $env:HAB_FALLBACK_CHANNEL= "${{vars.HAB_FALLBACK_CHANNEL}}"
-          Invoke-Expression "& { $(Invoke-RestMethod https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1) } -Version ${{vars.HABITAT_VERSION_SET}}"
-      - name: run habitat packaging windows
-        if: ${{ matrix.os == 'windows-latest' }}
-        shell: pwsh
-        run: |
-          $env:Path += ";C:\ProgramData\Habitat"
-          hab license accept
-          hab origin key download ${{ env.HAB_ORIGIN }}
-          hab origin key download --auth ${{ secrets.HAB_AUTH_TOKEN }} --secret ${{ env.HAB_ORIGIN }}
-          write-output "--- running windows hab build"
-          hab pkg build .
-          $hartfile=(ls ./results -Name | findstr "cookstyle")
-          hab pkg install ./results/$hartfile
-          . ./results/last_build.ps1
-          habitat/tests/test.ps1 $pkg_ident
diff --git a/.github/workflows/habitat-publish.yml b/.github/workflows/habitat-publish.yml
deleted file mode 100644
index 1b821909..00000000
--- a/.github/workflows/habitat-publish.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-name: Publish Habitat packages
-
-on:
-  push:
-    branches:
-      - workstation-LTS
-  release:
-    types:
-      - created
-
-env:
-  # BLDR URL Defined as: 'https://bldr.habitat.sh/' but as an env var in workspace settings. 
-  BLDR_URL: ${{vars.BLDR_URL}}
-   # HAB_ORIGIN Defined as: 'chef' defined in workspace settings.
-  HAB_ORIGIN: ${{vars.HAB_ORIGIN}}
-  # BLDR_CHANNEL defaulted to unstable, but can be switched to stable, it is defined via the environment setting https://docs.github.com/en/actions/deployment/targeting-different-environments/using-environments-for-deployment#using-an-environment
-  BLDR_CHANNEL: ${{ vars.BLDR_CHANNEL }}
-  # HABITAT_VERSION_SET this is the version of habitat CLI you are using, defaults to latest.
-  HABITAT_VERSION_SET: ${{vars.HABITAT_VERSION_SET}}
-  # HAB_PACKAGE is the name of the project you are on, IE: node-management-agent
-  HAB_PACKAGE: ${{vars.HAB_PACKAGE}}
-  # HAB_AUTH_TOKEN your orgs/projects auth token value
-  HAB_AUTH_TOKEN: ${{ secrets.HAB_AUTH_TOKEN }}
-  HAB_FALLBACK_CHANNEL: ${{vars.HAB_FALLBACK_CHANNEL}}
-  # HABITAT_TARGET this is the CPU arch for the linux CLI tool, its defaulted to x86_64
-  #HABITAT_TARGET: $#{{vars.HABITAT_TARGET}}
-  # org-wide access token on https://github.com/organizations/progress-platform-services/settings/secrets/actions
-
-permissions:
-  contents: write
-
-jobs:
-  pre-build:
-    name: Setup before building packages
-    runs-on: ubuntu-latest
-    outputs:
-      app_version: ${{ steps.app_version.outputs.APP_VERSION }}
-    steps:
-      - name: Get branch name
-        id: get_branch_name
-        run: |
-          echo "BRANCH_NAME=${GITHUB_REF_NAME//\//-}" >> "$GITHUB_OUTPUT"
-      - name: Get version from tag
-        id: app_version
-        run: |
-          echo "APP_VERSION=${{ github.ref_type == 'tag' && github.ref_name || format('{0}-{1}', steps.get_branch_name.outputs.BRANCH_NAME, github.sha) }}" >> "$GITHUB_OUTPUT"
-  agent-matrix:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-      # matrix strategy is described at https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
-
-    runs-on: ${{ matrix.os }}
-    # free runner types are https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners
-    # from macos-latest, windows-latest, ubuntu-latest, ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016
-    # included software packages on runners are at https://github.com/actions/runner-images#available-images 
-    # environment: unstable
-    steps:
-      - name: print OS
-        run: echo "--- ${{ matrix.os }}"
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-
-      - name: install habitat on Linux
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        shell: bash
-        run: |
-          echo "--- STARTING HAB INSTALL ON  ${{ matrix.os }} UBUNTU with habitat version:${{vars.HABITAT_VERSION_SET}}"
-          export HABITAT_VERSION="${{vars.HABITAT_VERSION_SET}}"
-          HABITAT_VERSION="${HABITAT_VERSION:?HABITAT_VERSION must be set}"
-          HABITAT_TARGET="${HABITAT_TARGET:-x86_64-linux}"
-          export HAB_FALLBACK_CHANNEL="${{vars.HAB_FALLBACK_CHANNEL}}"
-          curl https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh | sudo bash -s -- -v "$HABITAT_VERSION" -t "$HABITAT_TARGET"
-      - name: run Habitat packaging (linux)
-        if: ${{ matrix.os == 'ubuntu-latest' }}
-        shell: bash
-        run: |
-          hab license accept
-          hab origin key download $HAB_ORIGIN
-          hab origin key download --auth $HAB_AUTH_TOKEN --secret $HAB_ORIGIN
-          echo "--- running linux hab build"
-          hab pkg build .
-          echo "--- pushing to ${{ env.BLDR_URL }}/#/${{ env.HAB_ORIGIN }}/${{ env.HAB_PACKAGE }}..."
-          source results/last_build.env
-          hab pkg upload --auth $HAB_AUTH_TOKEN results/$pkg_artifact
-          echo "--- push complete!!"
-      - name: Install Habitat on Windows
-        if: ${{ matrix.os == 'windows-latest' }}
-        shell: pwsh
-        run: |
-          write-output "--- STARTING HAB INSTALL ON ${{ matrix.os }} WINDOWS with habitat version:${{vars.HABITAT_VERSION_SET}}"
-          $env:HAB_LICENSE = "accept-no-persist"
-          $env:HAB_FALLBACK_CHANNEL= "${{vars.HAB_FALLBACK_CHANNEL}}"
-          Invoke-Expression "& { $(Invoke-RestMethod https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.ps1) } -Version ${{vars.HABITAT_VERSION_SET}}"
-      - name: run habitat packaging windows
-        if: ${{ matrix.os == 'windows-latest' }}
-        shell: pwsh
-        run: |
-          $env:Path += ";C:\ProgramData\Habitat"
-          hab license accept
-          hab origin key download ${{ env.HAB_ORIGIN }}
-          hab origin key download --auth ${{ secrets.HAB_AUTH_TOKEN }} --secret ${{ env.HAB_ORIGIN }}
-          write-output "--- running windows hab build"
-          hab pkg build .
-          write-output "--- pushing hab to unstable channel"
-          . results\last_build.ps1
-          hab pkg upload results\$pkg_artifact --auth ${{ secrets.HAB_AUTH_TOKEN }}
-          write-output "--- push complete!!"
diff --git a/habitat/tests/test.ps1 b/habitat/tests/test.ps1
index 3d07690f..212da72e 100644
--- a/habitat/tests/test.ps1
+++ b/habitat/tests/test.ps1
@@ -17,4 +17,5 @@ if ($package_version -eq $actual_version)
 }
 else {
     Write-Error "cookstyle version not met expected $package_version actual version $actual_version "
+    throw "cookstyle windows pipeline not working for hab pkg"
 }
\ No newline at end of file

From 8ce4e89e1bd15ab64f42879fdecfbe4d18f438bf Mon Sep 17 00:00:00 2001
From: nikhil2611 <nikhilgupta2102@gmail.com>
Date: Thu, 5 Dec 2024 16:16:32 +0530
Subject: [PATCH 10/10] removed the github verify

Signed-off-by: nikhil2611 <nikhilgupta2102@gmail.com>
---
 .github/workflows/verify.yml | 40 ------------------------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 .github/workflows/verify.yml

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
deleted file mode 100644
index ab8f49c1..00000000
--- a/.github/workflows/verify.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Verify Pipeline
-
-on:
-  # Trigger the workflow on push or pull request,
-  # but only for the main branch
-  push:
-    branches:
-      - workstation-LTS
-  pull_request:
-    branches:
-      - workstation-LTS
-
-jobs:    
-  unit-tests:
-    name: Execute Tests cases
-    runs-on: ubuntu-latest
-    
-    steps:
-      # Step 1: Checkout the code
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      # Step 2: Set up Ruby
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.1 # Use Ruby 3.1 as specified
-
-      # Step 3: Install project dependencies
-      - name: Install Bundler and Dependencies
-        run: |
-          rm -f .bundle/config
-          gem install bundler
-          bundle config set --local path 'vendor/bundle'
-          bundle install --jobs=3 --retry=3
-
-       # Step 4: Run the Unit tests
-      - name: Run Unit Tests
-        run: |
-          bundle exec rspec