From 3a7d2776b44ae10ca037196ceb1f9c87c6941591 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 14 Jul 2025 12:08:39 +0530 Subject: [PATCH] fixing habitat test builds by declaring HAB_ORIGIN after habitat install Signed-off-by: nikhil2611 --- .expeditor/buildkite/artifact.habitat.test.ps1 | 5 ++++- .expeditor/buildkite/artifact.habitat.test.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.expeditor/buildkite/artifact.habitat.test.ps1 b/.expeditor/buildkite/artifact.habitat.test.ps1 index b3258a15..d93b6ce0 100755 --- a/.expeditor/buildkite/artifact.habitat.test.ps1 +++ b/.expeditor/buildkite/artifact.habitat.test.ps1 @@ -7,7 +7,6 @@ $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' $env:HAB_LICENSE = 'accept-no-persist' $Plan = 'chef-cli' @@ -58,6 +57,10 @@ finally { Write-Host ":habicat: I think I have the version I need to build." } +# Set HAB_ORIGIN after Habitat installation +Write-Host "HAB_ORIGIN set to 'ci' after installation." +$env:HAB_ORIGIN = 'ci' + Write-Host "--- Generating fake origin key" hab origin key generate $env:HAB_ORIGIN diff --git a/.expeditor/buildkite/artifact.habitat.test.sh b/.expeditor/buildkite/artifact.habitat.test.sh index 9f12b8f4..e32cac63 100755 --- a/.expeditor/buildkite/artifact.habitat.test.sh +++ b/.expeditor/buildkite/artifact.habitat.test.sh @@ -2,7 +2,6 @@ set -eo pipefail -export HAB_ORIGIN='ci' export PLAN='chef-cli' export CHEF_LICENSE="accept-no-persist" export HAB_LICENSE="accept-no-persist" @@ -41,6 +40,10 @@ echo "--- Installing Habitat" id -a curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | bash +# Set HAB_ORIGIN after Habitat installation +echo "--- Setting HAB_ORIGIN to 'ci' after installation" +export HAB_ORIGIN='ci' + echo "--- :key: Generating fake origin key" hab origin key generate "$HAB_ORIGIN"