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

* updating version to major version and few plan file fixes Signed-off-by: nikhil2611 <[email protected]> * reverting back the release branch changes and version update Signed-off-by: nikhil2611 <[email protected]> * swapping order of action Signed-off-by: nikhil2611 <[email protected]> * swapping order of action to fix expeditor error Signed-off-by: nikhil2611 <[email protected]> * commenting the trigger pipeline to test expeditor config Signed-off-by: nikhil2611 <[email protected]> * commenting the build gem to test expeditor config Signed-off-by: nikhil2611 <[email protected]> * commenting the build gem to test expeditor config Signed-off-by: nikhil2611 <[email protected]> * fixing expeditor error Signed-off-by: nikhil2611 <[email protected]> * fixing expeditor error Signed-off-by: nikhil2611 <[email protected]> * fixing the expeditor errro Signed-off-by: nikhil2611 <[email protected]> * adding back the trigger pipeline Signed-off-by: nikhil2611 <[email protected]> * adding old config to test the expeditor failure Signed-off-by: nikhil2611 <[email protected]> * now trying to add updated config Signed-off-by: nikhil2611 <[email protected]> * adding release branch to test the expeditor validation Signed-off-by: nikhil2611 <[email protected]> * reverted back the release branch Signed-off-by: nikhil2611 <[email protected]> * update to unstable channel in the workload Signed-off-by: nikhil2611 <[email protected]> * removed the build gem Signed-off-by: nikhil2611 <[email protected]> * added back the release branch Signed-off-by: nikhil2611 <[email protected]> * added back the release branch Signed-off-by: nikhil2611 <[email protected]> * added the env variable in the builkite config Signed-off-by: nikhil2611 <[email protected]> --------- Signed-off-by: nikhil2611 <[email protected]>
chef · Jan 23, 2025 · 32f8dfd · 32f8dfd
1 parent 4ff900c
commit 32f8dfd
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 30 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='chef-vault'
 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
@@ -10,9 +10,8 @@ rubygems:
   - chef-vault
 
 artifact_channels:
-  - dev
-  - workstation-build
-  - LTS-2024
+  - unstable
+  - chef-dke-lts2024
 
 github:
   # This deletes the GitHub PR branch after successfully merged into the release branch
@@ -62,17 +61,13 @@ subscriptions:
       - 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:*
+  - workload: project_promoted:{{agent_id}}:unstable:*
     actions:
       - built_in:promote_habitat_packages
 
 pipelines:
   - verify:
       description: Pull Request validation tests
-      public: true
   - habitat/build:
       env:
         - HAB_NONINTERACTIVE: "true"
@@ -85,5 +80,4 @@ pipelines:
         - HAB_NONINTERACTIVE: "true"
         - HAB_NOCOLORING: "true"
         - HAB_STUDIO_SECRET_HAB_NONINTERACTIVE: "true"
-      trigger: pull_request
-
+      trigger: pull_request
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.2
+4.1.13
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="chef-vault"
 $pkg_origin="chef"
 $pkg_version=$(Get-Content "$PLAN_CONTEXT/../VERSION")

diff --git a/habitat/plan.sh b/habitat/plan.sh
@@ -1,27 +1,30 @@
-export HAB_BLDR_CHANNEL="LTS-2024"
-_chef_client_ruby="core/ruby3_1"
+ruby_pkg="core/ruby3_1"
 pkg_name="chef-vault"
 pkg_origin="chef"
 pkg_maintainer="The Chef Maintainers <[email protected]>"
 pkg_description="Gem that allows you to encrypt a Chef Data Bag Item using the public keys of a list of chef nodes. This allows only those chef nodes to decrypt the encrypted values."
 pkg_license=('Apache-2.0')
 pkg_bin_dirs=(
   bin
-  vendor/bin
 )
 pkg_build_deps=(
   core/make
   core/bash
   core/gcc
   core/libarchive
 )
-pkg_deps=(
-  $_chef_client_ruby
-  core/coreutils
-  core/git
-)
+pkg_deps=(${ruby_pkg} 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"
 }
@@ -36,8 +39,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"
@@ -50,13 +53,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 chef-vault-*.gem --no-document
   wrap_ruby_chef_vault
-  set_runtime_env "GEM_PATH" "${pkg_prefix}/vendor/gems"
+  set_runtime_env "GEM_PATH" "${pkg_prefix}/vendor"
 }
 
 wrap_ruby_chef_vault() {
@@ -77,10 +80,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/chef-vault/version.rb b/lib/chef-vault/version.rb
@@ -15,6 +15,6 @@
 # limitations under the License.
 
 class ChefVault
-  VERSION = "0.1.2"
+  VERSION = "4.1.13"
   MAJOR, MINOR, TINY = VERSION.split(".")
 end