Skip to content

Commit

Permalink
added HAB_BLDR_CHANNEL env as the build pipeline still using old hab …
Browse files Browse the repository at this point in the history
…version and updated config for a symantec version promote and publish and reverting back version and release branch changes

Signed-off-by: nikhil2611 <[email protected]>
  • Loading branch information
nikhil2611 committed Feb 2, 2025
1 parent 6c077d8 commit 01b67e6
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 18 deletions.
3 changes: 2 additions & 1 deletion .expeditor/buildkite/artifact.habitat.test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
# TODO: Set-StrictMode -Version Latest
$PSDefaultParameterValues['*:ErrorAction']='Stop'
$ErrorActionPreference = 'Stop'
$env:HAB_BLDR_CHANNEL = "LTS-2024"
$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'
Expand Down
3 changes: 2 additions & 1 deletion .expeditor/buildkite/artifact.habitat.test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ export HAB_ORIGIN='ci'
export PLAN='chef-cli'
export CHEF_LICENSE="accept-no-persist"
export HAB_LICENSE="accept-no-persist"
export HAB_BLDR_CHANNEL="LTS-2024"
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
Expand Down
28 changes: 14 additions & 14 deletions .expeditor/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ rubygems:
- chef-cli

release_branches:
- workstation-LTS:
version_constraint: 6.*
- main:
version_constraint: 5.*

github:
# This deletes the GitHub PR branch after successfully merged into the release branch
delete_branch_on_merge: true
Expand All @@ -28,10 +27,10 @@ github:

changelog:
rollup_header: Changes not yet released to rubygems.org

artifact_channels:
- dev
- workstation-build
- LTS-2024
- unstable
- chef-dke-lts2024

pipelines:
- verify:
Expand Down Expand Up @@ -61,20 +60,21 @@ subscriptions:
- "Expeditor: Skip All"
- bash:.expeditor/update_version.sh:
only_if: built_in:bump_version
- built_in:update_changelog:
ignore_labels:
- "Expeditor: Skip Changelog"
- "Expeditor: Skip All"
- built_in:build_gem:
only_if: built_in:bump_version
- trigger_pipeline:habitat/build:
only_if: built_in:bump_version
ignore_labels:
- "Expeditor: Skip Habitat"
- "Expeditor: Skip All"

- workload: buildkite_hab_build_group_published:{{agent_id}}:*
actions:
# when all of the hab package publish to the unstable channel, test and promote them
- built_in:promote_habitat_packages
# Subscribe to the promotion of the dev channel to acceptance
- workload: project_promoted:{{agent_id}}:dev:*
actions:
- built_in:promote_habitat_packages
- workload: project_promoted:{{agent_id}}:workstation-build:*
# this works for symantec version promote
- workload: project_promoted:{{agent_id}}:*
actions:
- built_in:rollover_changelog
- built_in:promote_habitat_packages
- built_in:publish_rubygems
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.0
5.6.16
1 change: 1 addition & 0 deletions habitat/plan.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
$ErrorActionPreference = "Stop"
$PSDefaultParameterValues['*:ErrorAction']='Stop'

$env:HAB_BLDR_CHANNEL = "LTS-2024"
$env:HAB_REFRESH_CHANNEL = "LTS-2024"
$pkg_name="chef-cli"
$pkg_origin="chef"
Expand Down
1 change: 1 addition & 0 deletions habitat/plan.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export HAB_BLDR_CHANNEL="LTS-2024"
export HAB_REFRESH_CHANNEL="LTS-2024"
pkg_name=chef-cli
pkg_origin=chef
Expand Down
2 changes: 1 addition & 1 deletion lib/chef-cli/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
#

module ChefCLI
VERSION = "6.0.0".freeze
VERSION = "5.6.16".freeze
end

0 comments on commit 01b67e6

Please sign in to comment.