From 5e72e426ae5886cc11b08083556093136cdc24f7 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Sun, 2 Feb 2025 14:38:10 +0530 Subject: [PATCH] added HAB_BLDR_CHANNEL env as the build pipeline still using old hab version Signed-off-by: nikhil2611 --- .expeditor/build.habitat.yml | 2 -- .expeditor/buildkite/artifact.habitat.test.ps1 | 1 + .expeditor/buildkite/artifact.habitat.test.sh | 1 + .expeditor/habitat-test.pipeline.yml | 2 -- habitat/plan.ps1 | 1 + habitat/plan.sh | 1 + 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml index d7566b51d..9c2d3d7a2 100644 --- a/.expeditor/build.habitat.yml +++ b/.expeditor/build.habitat.yml @@ -4,8 +4,6 @@ origin: chef expeditor: defaults: buildkite: - env: - HAB_STUDIO_SECRET_HAB_REFRESH_CHANNEL: "LTS-2024" 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 index 693795fb6..1bbc875fe 100644 --- a/.expeditor/buildkite/artifact.habitat.test.ps1 +++ b/.expeditor/buildkite/artifact.habitat.test.ps1 @@ -5,6 +5,7 @@ # TODO: Set-StrictMode -Version Latest $PSDefaultParameterValues['*:ErrorAction']='Stop' $ErrorActionPreference = 'Stop' +$env:HAB_BLDR_CHANNEL = 'LTS-2024' $env:HAB_REFRESH_CHANNEL = "LTS-2024" $env:HAB_ORIGIN = 'ci' $env:CHEF_LICENSE = 'accept-no-persist' diff --git a/.expeditor/buildkite/artifact.habitat.test.sh b/.expeditor/buildkite/artifact.habitat.test.sh index 8fb484c24..7a7b81731 100755 --- a/.expeditor/buildkite/artifact.habitat.test.sh +++ b/.expeditor/buildkite/artifact.habitat.test.sh @@ -6,6 +6,7 @@ export HAB_ORIGIN='ci' export PLAN='berkshelf' export CHEF_LICENSE="accept-no-persist" export HAB_LICENSE="accept-no-persist" +export HAB_BLDR_CHANNEL='LTS-2024' export HAB_REFRESH_CHANNEL="LTS-2024" echo "--- checking if git is installed" diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml index 315681cf1..39493f20c 100644 --- 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_STUDIO_SECRET_HAB_REFRESH_CHANNEL: "LTS-2024" retry: automatic: limit: 1 diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index d39e2a71c..7ff8a3af7 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -1,6 +1,7 @@ $ErrorActionPreference = "Stop" $PSDefaultParameterValues['*:ErrorAction']='Stop' +$env:HAB_BLDR_CHANNEL = "LTS-2024" $env:HAB_REFRESH_CHANNEL = "LTS-2024" $pkg_name="berkshelf" $pkg_origin="chef" diff --git a/habitat/plan.sh b/habitat/plan.sh index 07d44148a..deaef2496 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -1,3 +1,4 @@ +export HAB_BLDR_CHANNEL="LTS-2024" export HAB_REFRESH_CHANNEL="LTS-2024" pkg_name="berkshelf" pkg_origin="chef"