diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml index d28cae6fa..9c2d3d7a2 100644 --- 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 index edbea3a28..1bbc875fe 100644 --- a/.expeditor/buildkite/artifact.habitat.test.ps1 +++ b/.expeditor/buildkite/artifact.habitat.test.ps1 @@ -5,6 +5,8 @@ # 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' $env:HAB_LICENSE = 'accept-no-persist' diff --git a/.expeditor/buildkite/artifact.habitat.test.sh b/.expeditor/buildkite/artifact.habitat.test.sh index 3a4b254b3..7a7b81731 100755 --- a/.expeditor/buildkite/artifact.habitat.test.sh +++ b/.expeditor/buildkite/artifact.habitat.test.sh @@ -6,6 +6,8 @@ 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" if ! command -v git &> /dev/null; then diff --git a/.expeditor/config.yml b/.expeditor/config.yml index d106458c3..020d6b7ed 100644 --- 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 \ No newline at end of file diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml index 3f117add3..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_REFRESH_CHANNEL: "LTS-2024" retry: automatic: limit: 1 diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 0140fd590..7ff8a3af7 100644 --- 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="berkshelf" $pkg_origin="chef" $pkg_version=$(Get-Content "$PLAN_CONTEXT/../VERSION") diff --git a/habitat/plan.sh b/habitat/plan.sh index 51fddb4c0..deaef2496 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -1,3 +1,5 @@ +export HAB_BLDR_CHANNEL="LTS-2024" +export HAB_REFRESH_CHANNEL="LTS-2024" pkg_name="berkshelf" pkg_origin="chef" ruby_pkg="core/ruby3_1"