Merge pull request #999 from chef/nikhil/update-config-promote-package

Updating configuration for a symantec version promote and publish
chef · Feb 4, 2025 · 1b84d45 · 1b84d45
2 parents 6055f28 + ecae5fd
commit 1b84d45
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml
@@ -1,7 +1,4 @@
 ---
-env:
-  HAB_REFRESH_CHANNEL: "LTS-2024"
-
 origin: chef
 
 expeditor:

diff --git a/.expeditor/buildkite/artifact.habitat.test.ps1 b/.expeditor/buildkite/artifact.habitat.test.ps1
@@ -5,7 +5,8 @@
 # TODO: Set-StrictMode -Version Latest
 $PSDefaultParameterValues['*:ErrorAction']='Stop'
 $ErrorActionPreference = 'Stop'
-# $env:HAB_REFRESH_CHANNEL = "LTS-2024"
+$env:HAB_BLDR_CHANNEL = 'LTS-2024'
+$env:HAB_REFRESH_CHANNEL = "LTS-2024"
 $env:HAB_ORIGIN = 'ci'
 $env:CHEF_LICENSE = 'accept-no-persist'
 $env:HAB_LICENSE = 'accept-no-persist'

diff --git a/.expeditor/buildkite/artifact.habitat.test.sh b/.expeditor/buildkite/artifact.habitat.test.sh
@@ -6,7 +6,8 @@ export HAB_ORIGIN='ci'
 export PLAN='cookstyle'
 export CHEF_LICENSE="accept-no-persist"
 export HAB_LICENSE="accept-no-persist"
-# export HAB_REFRESH_CHANNEL="LTS-2024"
+export HAB_BLDR_CHANNEL='LTS-2024'
+export HAB_REFRESH_CHANNEL="LTS-2024"
 
 echo "--- checking if git is installed"
 if ! command -v git &> /dev/null; then

diff --git a/.expeditor/config.yml b/.expeditor/config.yml
@@ -71,12 +71,9 @@ subscriptions:
             - "Expeditor: Skip Habitat"
             - "Expeditor: Skip All"
 
+  # this works for symantec version promote
   - workload: project_promoted:{{agent_id}}:*
     actions:
       - built_in:rollover_changelog
-
-  # Subscribe to the promotion of the unstable channel to stable(chef-dke-lts2024)
-  - workload: project_promoted:{{agent_id}}:unstable:*
-    actions:
       - built_in:promote_habitat_packages
       - built_in:publish_rubygems
diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml
@@ -3,8 +3,6 @@ expeditor:
   defaults:
     buildkite:
       timeout_in_minutes: 30
-      env: 
-        HAB_REFRESH_CHANNEL: "LTS-2024"
       retry:
         automatic:
           limit: 1

diff --git a/habitat/plan.ps1 b/habitat/plan.ps1
@@ -1,6 +1,8 @@
 $ErrorActionPreference = "Stop"
 $PSDefaultParameterValues['*:ErrorAction']='Stop'
 
+$env:HAB_BLDR_CHANNEL = "LTS-2024"
+$env:HAB_REFRESH_CHANNEL = "LTS-2024"
 $pkg_name="cookstyle"
 $pkg_origin="chef"
 $pkg_version=$(Get-Content "$PLAN_CONTEXT/../VERSION")

diff --git a/habitat/plan.sh b/habitat/plan.sh
@@ -1,3 +1,5 @@
+export HAB_BLDR_CHANNEL="LTS-2024"
+export HAB_REFRESH_CHANNEL="LTS-2024"
 ruby_pkg="core/ruby3_1"
 pkg_name="cookstyle"
 pkg_origin="chef"