Chef-18535 Removed the release branch changes and fixed pipeline (#53)

* Updated the version for workstation-LTS to major version Signed-off-by: nikhil2611 <[email protected]> * corrected the plan file Signed-off-by: nikhil2611 <[email protected]> * updated the env from HAB_BLDR_CHANNEL to HAB_REFRESH_CHANNEL Signed-off-by: nikhil2611 <[email protected]> * remoed the release branch changes and fixing pipeline Signed-off-by: nikhil2611 <[email protected]> * adding back berkshelf rubygem Signed-off-by: nikhil2611 <[email protected]> * fixing expeditor config error Signed-off-by: nikhil2611 <[email protected]> --------- Signed-off-by: nikhil2611 <[email protected]>
chef · Jan 23, 2025 · e2a7c30 · e2a7c30
1 parent 2b78c7b
commit e2a7c30
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 38 deletions.
diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml
@@ -1,4 +1,7 @@
 ---
+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
@@ -5,7 +5,6 @@
 # TODO: Set-StrictMode -Version Latest
 $PSDefaultParameterValues['*:ErrorAction']='Stop'
 $ErrorActionPreference = 'Stop'
-$env:HAB_BLDR_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
@@ -6,7 +6,6 @@ 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"
 
 echo "--- checking if git is installed"
 if ! command -v git &> /dev/null; then

diff --git a/.expeditor/config.yml b/.expeditor/config.yml
@@ -4,6 +4,10 @@
 slack:
   notify_channel: chef-ws-notify
 
+# This publish is triggered by the `built_in:publish_rubygems` artifact_action.
+rubygems:
+  - berkshelf
+
 github:
   # This deletes the GitHub PR branch after successfully merged into the release branch
   delete_branch_on_merge: true
@@ -17,15 +21,12 @@ github:
     - "Expeditor: Bump Version Major"
 
 release_branches:
-  - workstation-LTS:
-      version_constraint: 0.*
   - main:
       version_constraint: 8.*
 
 artifact_channels:
-  - dev
-  - workstation-build
-  - LTS-2024
+  - unstable
+  - chef-dke-lts2024
 
 changelog:
   rollup_header: Changes not yet released to rubygems.org
@@ -62,27 +63,26 @@ subscriptions:
           ignore_labels:
             - "Expeditor: Skip Changelog"
             - "Expeditor: Skip All"
-      - trigger_pipeline:habitat/test:
+      - built_in:build_gem:
           only_if: built_in:bump_version
-          ignore_labels:
-            - "Expeditor: Skip Habitat"
-            - "Expeditor: Skip All"
       - trigger_pipeline:habitat/build:
           only_if: built_in:bump_version
           ignore_labels:
             - "Expeditor: Skip Habitat"
             - "Expeditor: Skip All"
 
+  - workload: project_promoted:{{agent_id}}:*
+    actions:
+      - built_in:rollover_changelog
+
   # the habitat chain
   - 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:*
+ # 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
diff --git a/.expeditor/habitat-test.pipeline.yml b/.expeditor/habitat-test.pipeline.yml
@@ -3,6 +3,8 @@ expeditor:
   defaults:
     buildkite:
       timeout_in_minutes: 30
+      env: 
+        HAB_REFRESH_CHANNEL: "LTS-2024"
       retry:
         automatic:
           limit: 1

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.12
+8.0.16
diff --git a/habitat/plan.ps1 b/habitat/plan.ps1
@@ -1,7 +1,6 @@
 $ErrorActionPreference = "Stop"
 $PSDefaultParameterValues['*:ErrorAction']='Stop'
 
-$env:HAB_BLDR_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
@@ -1,25 +1,24 @@
-export HAB_BLDR_CHANNEL="LTS-2024"
-_chef_client_ruby="core/ruby3_1"
 pkg_name="berkshelf"
 pkg_origin="chef"
+ruby_pkg="core/ruby3_1"
 pkg_maintainer="The Chef Maintainers <[email protected]>"
 pkg_description="Manage Chef Infra cookbooks and cookbook dependencies."
 pkg_license=('Apache-2.0')
-pkg_bin_dirs=(
-  bin
-  vendor/bin
-)
+pkg_deps=(${ruby_pkg} core/coreutils)
+pkg_bin_dirs=(bin)
 pkg_build_deps=(
   core/make
   core/bash
   core/gcc
 )
-pkg_deps=(
-  $_chef_client_ruby
-  core/coreutils
-  core/git
-)
-pkg_svc_user=root
+
+do_setup_environment() {
+  build_line 'Setting GEM_HOME="$pkg_prefix/vendor"'
+  export GEM_HOME="$pkg_prefix/vendor"
+
+  build_line "Setting GEM_PATH=$GEM_HOME"
+  export GEM_PATH="$GEM_HOME"
+}
 
 pkg_version() {
   cat "$SRC_PATH/VERSION"
@@ -35,8 +34,8 @@ do_unpack() {
 }
 
 do_build() {
-  echo $(pkg_path_for $_chef_client_ruby)
-  export GEM_HOME="$pkg_prefix/vendor/gems"
+
+  export GEM_HOME="$pkg_prefix/vendor"
 
   build_line "Setting GEM_PATH=$GEM_HOME"
   export GEM_PATH="$GEM_HOME"
@@ -49,13 +48,13 @@ do_build() {
 }
 
 do_install() {
-  export GEM_HOME="$pkg_prefix/vendor/gems"
+  export GEM_HOME="$pkg_prefix/vendor"
 
   build_line "Setting GEM_PATH=$GEM_HOME"
   export GEM_PATH="$GEM_HOME"
   gem install berkshelf-*.gem --no-document
   wrap_ruby_berkshelf
-  set_runtime_env "GEM_PATH" "${pkg_prefix}/vendor/gems"
+  set_runtime_env "GEM_PATH" "${pkg_prefix}/vendor"
 }
 
 wrap_ruby_berkshelf() {
@@ -76,10 +75,10 @@ set -e
 export PATH="/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin:/usr/bin:/bin:\$PATH"
 
 # Set Ruby paths defined from 'do_setup_environment()'
-export GEM_HOME="$pkg_prefix/vendor/gems"
-export GEM_PATH="\$GEM_HOME"
+export GEM_HOME="$pkg_prefix/vendor"
+export GEM_PATH="$GEM_PATH"
 
-exec $(pkg_path_for $_chef_client_ruby)/bin/ruby $real_bin \$@
+exec $(pkg_path_for ${ruby_pkg})/bin/ruby $real_bin \$@
 EOF
   chmod -v 755 "$bin"
 }

diff --git a/lib/berkshelf/version.rb b/lib/berkshelf/version.rb
@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "0.1.12".freeze
+  VERSION = "8.0.16".freeze
 end