From 94add365708eb9fa58d1ae5592d5c49f490402f5 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Fri, 31 Jan 2025 17:19:44 +0530 Subject: [PATCH 1/4] publish rubygem in separate workload Signed-off-by: nikhil2611 --- .expeditor/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index d106458c3..71b213ef4 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -74,9 +74,9 @@ subscriptions: - workload: project_promoted:{{agent_id}}:* actions: - built_in:rollover_changelog + - built_in:publish_rubygems # 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 + - built_in:promote_habitat_packages \ No newline at end of file From 4cde9992b129df2daa04b508f4cd6f640f385066 Mon Sep 17 00:00:00 2001 From: Sean Simmons Date: Fri, 31 Jan 2025 11:54:12 -0500 Subject: [PATCH 2/4] updating configuration for a symantec version promote since w are only using / needing TWO channels, lets promote on the semantic-version Signed-off-by: Sean Simmons --- .expeditor/config.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 71b213ef4..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 - - built_in:publish_rubygems - - # 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 \ No newline at end of file + - built_in:promote_habitat_packages + - built_in:publish_rubygems \ No newline at end of file From ee797c4ecd189c9672b52302dd4ddbf0e8b3c067 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Sat, 1 Feb 2025 22:24:24 +0530 Subject: [PATCH 3/4] added back the env var Signed-off-by: nikhil2611 --- .expeditor/build.habitat.yml | 5 ++--- .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, 7 insertions(+), 4 deletions(-) diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml index d28cae6fa..d7566b51d 100644 --- a/.expeditor/build.habitat.yml +++ b/.expeditor/build.habitat.yml @@ -1,12 +1,11 @@ --- -env: - HAB_REFRESH_CHANNEL: "LTS-2024" - 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 edbea3a28..693795fb6 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_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..8fb484c24 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_REFRESH_CHANNEL="LTS-2024" echo "--- checking if git is installed" if ! command -v git &> /dev/null; then diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml index 3f117add3..315681cf1 100644 --- a/.expeditor/habitat-test.pipeline.yml +++ b/.expeditor/habitat-test.pipeline.yml @@ -4,7 +4,7 @@ expeditor: buildkite: timeout_in_minutes: 30 env: - HAB_REFRESH_CHANNEL: "LTS-2024" + HAB_STUDIO_SECRET_HAB_REFRESH_CHANNEL: "LTS-2024" retry: automatic: limit: 1 diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 0140fd590..d39e2a71c 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -1,6 +1,7 @@ $ErrorActionPreference = "Stop" $PSDefaultParameterValues['*:ErrorAction']='Stop' +$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..07d44148a 100644 --- a/habitat/plan.sh +++ b/habitat/plan.sh @@ -1,3 +1,4 @@ +export HAB_REFRESH_CHANNEL="LTS-2024" pkg_name="berkshelf" pkg_origin="chef" ruby_pkg="core/ruby3_1" From 5e72e426ae5886cc11b08083556093136cdc24f7 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Sun, 2 Feb 2025 14:38:10 +0530 Subject: [PATCH 4/4] 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"