Moved the env variable from plan file to the config

Signed-off-by: Ashique Saidalavi <[email protected]>
chef · Jan 23, 2025 · da2fff9 · da2fff9
1 parent 9b4193b
commit da2fff9
Show file tree

Hide file tree

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

diff --git a/.expeditor/buildkite/artifact.habitat.test.ps1 b/.expeditor/buildkite/artifact.habitat.test.ps1
@@ -5,7 +5,6 @@
 # TODO: Set-StrictMode -Version Latest
 $PSDefaultParameterValues['*:ErrorAction']='Stop'
 $ErrorActionPreference = 'Stop'
-$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,6 @@ export HAB_ORIGIN='ci'
 export PLAN='chef-test-kitchen-enterprise'
 export CHEF_LICENSE="accept-no-persist"
 export HAB_LICENSE="accept-no-persist"
-export HAB_REFRESH_CHANNEL="LTS-2024"
 
 echo "--- checking if git is installed"
 if ! command -v git &> /dev/null; then

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

diff --git a/habitat/plan.sh b/habitat/plan.sh
@@ -1,10 +1,9 @@
-export HAB_REFRESH_CHANNEL="LTS-2024"
-_chef_client_ruby="core/ruby3_1"
 pkg_name="chef-test-kitchen-enterprise"
 pkg_origin="chef"
 pkg_maintainer="The Chef Maintainers <[email protected]>"
 pkg_description="The Chef Test Kitchen Enterprise"
 pkg_license=('Apache-2.0')
+_chef_client_ruby="core/ruby3_1"
 pkg_bin_dirs=(
   bin
 )