chef · rensycthomas · Mar 5, 2025
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
@@ -87,7 +87,7 @@ steps:
 
   - label: ":ruby: :buildkite: a2-ha-backend/automate-cluster-ctl"
     commands:
-      - gem install bundler:2.3.27
+      - gem install bundler:2.6.5
       - cd components/automate-cluster-ctl/; bundle install --jobs=3 --retry=3
       - bundle exec rspec
     expeditor:

diff --git a/.studio/common b/.studio/common
@@ -205,11 +205,11 @@ function build() {
   install_if_missing "$(desired_golang_ident)" go
   local hab_build
   #set HAB_BLDR_CHANNEL to dev as part of the hab package refresh
-  local HAB_BLDR_CHANNEL=dev
+  local HAB_BLDR_CHANNEL=LTS-2024
   local HAB_FALLBACK
 
   if [ -z $HAB_FALLBACK_CHANNEL ]; then
-    HAB_FALLBACK=LTS-2024
+    HAB_FALLBACK=dev
   else 
     HAB_FALLBACK=$HAB_FALLBACK_CHANNEL
   fi 

diff --git a/components/automate-backend-ctl/habitat/bin/knife b/components/automate-backend-ctl/habitat/bin/knife
@@ -23,7 +23,7 @@ cd "$pkg_prefix"
 
 # These shouldn't be needed as habitat will have these in the path already
 #BUNDLE_BIN_DIR=$(hab pkg path "core/bundler")/bin
-#RUBY_BIN_DIR=$(hab pkg path "core/ruby31")/bin
+#RUBY_BIN_DIR=$(hab pkg path "core/ruby3_4")/bin
 
 #export PATH=$PATH:$BUNDLE_BIN_DIR:$RUBY_BIN_DIR
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(hab pkg path "core/libffi")/lib

diff --git a/components/automate-backend-ctl/habitat/plan.sh b/components/automate-backend-ctl/habitat/plan.sh
@@ -1,6 +1,5 @@
 #stable channel
 
-
 pkg_name="automate-ha-ctl"
 pkg_origin="chef"
 pkg_version="0.1.0"
@@ -12,20 +11,21 @@ do_before() {
   update_pkg_version
 }
 
+
 pkg_deps=(
-  core/ruby31/3.1.6/20240912144513
-  core/libffi/3.4.2/20240105233930
-  chef/mlsa/1.0.1/20240125084021
-  core/bash/5.1/20240105214248
-  core/coreutils/8.32/20240105213308
-  core/glibc/2.35/20240105171810
-  core/postgresql-client/9.6.24/20240106122111
+  core/ruby3_4
+  core/libffi
+  chef/mlsa
+  core/bash
+  core/coreutils
+  core/glibc
+  core/postgresql13-client
 )
 
 pkg_build_deps=(
-  core/make/4.3/20240105222044
-  core/gcc/9.5.0/20240105175314
-  core/rsync/3.2.3/20240107034222
+  core/make
+  core/gcc
+  core/rsync
 )
 
 pkg_bin_dirs=(bin)
@@ -46,7 +46,7 @@ do_prepare() {
   gem update --system --no-document
   gem install bundler -v "$(grep -A 1 "BUNDLED WITH" $PLAN_CONTEXT/Gemfile.lock | tail -n 1)"
 
-  export GEM_HOME="$pkg_prefix/vendor/bundle/ruby/3.1.0"
+  export GEM_HOME="$pkg_prefix/vendor/bundle/ruby/3.4.0"
   build_line "Setting GEM_HOME='$GEM_HOME'"
   export GEM_PATH="$GEM_HOME"
   build_line "Setting GEM_PATH='$GEM_PATH'"
@@ -96,7 +96,7 @@ if test -n "\$DEBUG"; then set -x; fi
 export GEM_HOME="$GEM_HOME"
 export GEM_PATH="$GEM_PATH"
 unset RUBYOPT GEMRC
-exec $(pkg_path_for ruby31)/bin/ruby -I $pkg_prefix/lib ${bin}.real \$@
+exec $(pkg_path_for ruby3_4)/bin/ruby -I $pkg_prefix/lib ${bin}.real \$@
 EOF
   chmod -v 755 "$bin"
 }

diff --git a/components/automate-backend-deployment/habitat/plan.sh b/components/automate-backend-deployment/habitat/plan.sh
@@ -8,31 +8,31 @@ pkg_maintainer="Chef Software Inc. <support@chef.io>"
 pkg_license=("Chef-MLSA")
 
 pkg_deps=(
-  core/ruby31/3.1.6/20240912144513
-  core/aws-cli/1.31.4/20240106034739
-  core/bash/5.1/20240105214248
-  core/coreutils/8.32/20240105213308
-  core/cacerts/2021.10.26/20240105224256
-  core/findutils/4.9.0/20240105220908
-  core/gawk/5.1.0/20240105214723
-  core/gzip/1.13/20240105221940
-  core/jq-static/1.6/20240107004905
-  core/openssh/7.9p1/20240106022237
-  core/openssl/1.0.2zi/20240105224424
-  core/make/4.3/20240105222044
-  core/curl/8.7.1/20240614090648
-  core/rsync/3.2.3/20240107034222
-  core/terraform1/1.5.7/20240106055300
-  core/busybox-static/1.34.1/20240105230035
-  chef/automate-ha-cluster-ctl
+  core/ruby3_4
+  core/aws-cli
+  core/bash
+  core/coreutils
+  core/cacerts
+  core/findutils
+  core/gawk
+  core/gzip
+  core/jq-static
+  core/openssh
+  core/openssl
+  core/make
+  core/curl
+  core/rsync
+  core/terraform
+  core/busybox-static
+  rensycthomas/automate-ha-cluster-ctl
 )
 
 #core/aws-cli ( core/aws-cli/1.21.11/20231020110846 core/aws-cli/1.21.11/20220817123642 )
    # core/openssl11 ( core/openssl11/1.1.1w/20231020105352 core/openssl11/1.1.1k/20220311131131 )
    # core/python ( core/python/3.10.0/20231020105702 core/python/3.10.0/20220817121853 )
    #
 pkg_build_deps=(
-  core/gcc/9.5.0/20240105175314
+  core/gcc
 )
 
 # workaround for https://github.com/habitat-sh/habitat/issues/6341

diff --git a/components/automate-backend-elasticsidecar/habitat/plan.sh b/components/automate-backend-elasticsidecar/habitat/plan.sh
@@ -11,13 +11,13 @@ pkg_license=("Chef-MLSA")
 pkg_version="0.1.0"
 pkg_upstream_url="http://github.com/chef/automate/components/automate-backend-elasticsidecar"
 pkg_deps=(
-  core/bash/5.1/20240105214248
-  chef/automate-openjdk
-  chef/automate-ha-opensearch
+  core/bash
+  rensycthomas/automate-openjdk
+  rensycthomas/automate-ha-opensearch
 )
 pkg_build_deps=(
-  core/make/4.3/20240105222044
-  core/gcc/9.5.0/20240105175314
+  core/make
+  core/gcc
 )
 
 pkg_binds=(

diff --git a/components/automate-backend-haproxy/habitat/plan.sh b/components/automate-backend-haproxy/habitat/plan.sh
@@ -12,9 +12,9 @@ pkg_upstream_url="https://www.chef.io/automate"
 pkg_version="2.2.14"
 pkg_build_deps=("${UPSTREAM_PKG_IDENT}")
 pkg_deps=(
-  chef/mlsa/1.0.1/20240125084021
-  core/bash/5.1/20240105214248
-  core/netcat-openbsd/1.226/20240106172343
+  chef/mlsa
+  core/bash
+  core/netcat-openbsd
   "${UPSTREAM_PKG_IDENT}"
 )
 

diff --git a/components/automate-backend-opensearch/habitat/config/sidecar b/components/automate-backend-opensearch/habitat/config/sidecar
@@ -1,4 +1,4 @@
 #!{{pkgPathFor "core/bash"}}/bin/bash
 echo "------------- starting opensearch sidecar -------------------"
-HAB_LICENSE=accept-no-persist GEM_PATH={{pkg.path}}/lib/gems {{pkgPathFor "core/ruby31"}}/bin/ruby {{pkg.path}}/bin/opensearch_sidecar.rb
+HAB_LICENSE=accept-no-persist GEM_PATH={{pkg.path}}/lib/gems {{pkgPathFor "core/ruby3_4"}}/bin/ruby {{pkg.path}}/bin/opensearch_sidecar.rb
 echo "-------------------------------------------------------------"
diff --git a/components/automate-backend-opensearch/habitat/hooks/run b/components/automate-backend-opensearch/habitat/hooks/run
@@ -47,11 +47,11 @@ source {{pkg.svc_config_path}}/init_ca
 echo "JDK PATH"
 echo $JDK_PKG_PATH
 
-hab pkg exec chef/automate-openjdk keytool -printcert -sslserver s3.amazonaws.com:443 -rfc >> {{pkg.svc_config_path}}/aws-s3.crt
+hab pkg exec rensycthomas/automate-openjdk keytool -printcert -sslserver s3.amazonaws.com:443 -rfc >> {{pkg.svc_config_path}}/aws-s3.crt
 
-hab pkg exec chef/automate-openjdk keytool -noprompt -importcert -alias s3.amazonaws.com -keystore {{pkg.svc_var_path}}/ca.jks -storepass changeit -file {{pkg.svc_config_path}}/aws-s3.crt
+hab pkg exec rensycthomas/automate-openjdk keytool -noprompt -importcert -alias s3.amazonaws.com -keystore {{pkg.svc_var_path}}/ca.jks -storepass changeit -file {{pkg.svc_config_path}}/aws-s3.crt
 
-hab pkg exec chef/automate-openjdk keytool -noprompt -importcert -alias s3.amazonaws.com -keystore $JDK_PKG_PATH/lib/security/cacerts -storepass changeit -file {{pkg.svc_config_path}}/aws-s3.crt
+hab pkg exec rensycthomas/automate-openjdk keytool -noprompt -importcert -alias s3.amazonaws.com -keystore $JDK_PKG_PATH/lib/security/cacerts -storepass changeit -file {{pkg.svc_config_path}}/aws-s3.crt
 exec opensearch
 
 

diff --git a/components/automate-backend-opensearch/habitat/plan.sh b/components/automate-backend-opensearch/habitat/plan.sh
@@ -12,21 +12,21 @@ pkg_upstream_url="https://www.chef.io/automate"
 pkg_source="https://artifacts.opensearch.org/releases/bundle/opensearch/1.3.20/opensearch-1.3.20-linux-x64.tar.gz"
 pkg_shasum=a786fe52b4d25db85cc49f34df6118f19c434b25935f28bd98c0f874ae77ccc3
 pkg_build_deps=(
-  core/patchelf/0.13/20240105212025
-  core/make/4.3/20240105222044
-  core/gcc/9.5.0/20240105175314
+  core/patchelf
+  core/make
+  core/gcc
 )
 
 pkg_deps=(
-  core/coreutils/8.32/20240105213308
-  core/glibc/2.35/20240105171810
-  core/zlib/1.3/20240105173710
-  core/bash/5.1/20240105214248 # hooks
-  chef/mlsa/1.0.1/20240125084021
-  core/curl/8.7.1/20240614090648 #healthcheck
-  chef/automate-openjdk
-  chef/automate-platform-tools/0.1.0/20241212061203
-  core/ruby31/3.1.6/20240912144513
+  core/coreutils
+  core/glibc
+  core/zlib
+  core/bash # hooks
+  chef/mlsa
+  core/curl #healthcheck
+  rensycthomas/automate-openjdk
+  chef/automate-platform-tools
+  core/ruby3_4
 )
 pkg_interpreters=(bin/ruby)
 pkg_bin_dirs=(os/bin)
@@ -95,7 +95,7 @@ do_install() {
   chmod 775 $PLAN_CONTEXT/config/securityconfig/roles_mapping.yml
   echo "......................................................................."
 
-  chmod 775 $(pkg_path_for chef/automate-openjdk)/lib/security/cacerts
+  chmod 775 $(pkg_path_for rensycthomas/automate-openjdk)/lib/security/cacerts
 
 
 }

diff --git a/components/automate-backend-postgresql/habitat/plan.sh b/components/automate-backend-postgresql/habitat/plan.sh
@@ -2,7 +2,7 @@
 # stable channel
 
 
-UPSTREAM_PKG_IDENT="core/postgresql13/13.18/20241203070217"
+UPSTREAM_PKG_IDENT="core/postgresql13"
 pkg_name="automate-ha-postgresql"
 pkg_description="Wrapper package for core/postgresql13"
 pkg_origin="chef"
@@ -13,8 +13,8 @@ pkg_license=("Chef-MLSA")
 pkg_upstream_url="https://www.chef.io/automate"
 
 pkg_deps=(
-  chef/mlsa/1.0.1/20240125084021
-  core/bash/5.1/20240105214248
+  chef/mlsa
+  core/bash
   "${UPSTREAM_PKG_IDENT}"
 )
 

diff --git a/components/automate-cluster-ctl/habitat/plan.sh b/components/automate-cluster-ctl/habitat/plan.sh
@@ -9,31 +9,31 @@ pkg_maintainer="Chef Software Inc. <support@chef.io>"
 pkg_license=("Chef-MLSA")
 
 pkg_deps=(
-  core/ruby31/3.1.6/20240912144513
-  core/aws-cli/1.31.4/20240106034739
+  core/ruby3_4
+  core/aws-cli
   # chef/inspec/4.56.61
-  core/bash/5.1/20240105214248
-  core/coreutils/8.32/20240105213308
-  core/cacerts/2021.10.26/20240105224256
-  core/findutils/4.9.0/20240105220908
-  core/gawk/5.1.0/20240105214723
-  core/gzip/1.13/20240105221940
-  core/jq-static/1.6/20240107004905
-  core/openssh/7.9p1/20240106022237
-  core/make/4.3/20240105222044
-  core/curl/8.7.1/20240614090648
-  core/terraform1/1.5.7/20240106055300
-  core/hab/1.6.1205/20241107140309
-  core/openssl/1.0.2zi/20240105224424
-  core/rsync/3.2.3/20240107034222
+  core/bash
+  core/coreutils
+  core/cacerts
+  core/findutils
+  core/gawk
+  core/gzip
+  core/jq-static
+  core/openssh
+  core/make
+  core/curl
+  core/terraform
+  core/hab
+  core/openssl
+  core/rsync
 
 #   core/openssh ( core/openssh/7.9p1/20220311132702 core/openssh/7.9p1/20230816095218 )
 #   core/openssl ( core/openssl/1.0.2zf/20230816063107 core/openssl/1.0.2zb/20220311111046 )
 #   core/ruby30 ( core/ruby30/3.0.3/20220312100602 core/ruby30/3.0.3/20230818185900 )
 )
 
 pkg_build_deps=(
-  core/gcc/9.5.0/20240105175314
+  core/gcc
 )
 
 pkg_bin_dirs=(bin)
@@ -100,7 +100,7 @@ do_unpack() {
 }
 
 do_setup_environment() {
-  export GEM_HOME="$pkg_prefix/vendor/bundle/ruby/3.1.0"
+  export GEM_HOME="$pkg_prefix/vendor/bundle/ruby/3.4.0"
   export GEM_PATH="$GEM_HOME"
 
   set_runtime_env GEM_HOME "$GEM_HOME"

diff --git a/components/automate-cluster-ctl/libexec/automate-cluster-ctl b/components/automate-cluster-ctl/libexec/automate-cluster-ctl
@@ -43,8 +43,8 @@ export _CLUSTER_CTL_VERSION="${AUTOMATE_CLUSTER_VERSION:-DEV}"
 
 # If not provided to use set it to our vendor/bundle
 if [[ -z "${GEM_PATH}" ]]; then
-  export GEM_PATH="$_CLUSTER_CTL_ROOT/vendor/bundle/ruby/3.1.0"
-  export GEM_HOME="$_CLUSTER_CTL_ROOT/vendor/bundle/ruby/3.1.0"
+  export GEM_PATH="$_CLUSTER_CTL_ROOT/vendor/bundle/ruby/3.4.0"
+  export GEM_HOME="$_CLUSTER_CTL_ROOT/vendor/bundle/ruby/3.4.0"
 fi
 
 export PATH="${libexec_path}:$PATH"

diff --git a/components/automate-cs-nginx/habitat/plan.sh b/components/automate-cs-nginx/habitat/plan.sh
@@ -11,16 +11,16 @@ pkg_license=('Chef-MLSA')
 # WARNING: Version managed by .expeditor/update_chef_server.sh
 pkg_version="15.10.33"
 pkg_deps=(
-  core/coreutils/8.32/20240105213308
-  chef/mlsa/1.0.1/20240125084021
+  core/coreutils
+  chef/mlsa
   # TODO 2020-05-12: PIN PIN PIN
   #
   # All dependencies that are shared between this package and the
   # chef-server-* packages are pinned to the versions required by the
   # chef-server-* packages.
   #
-  core/curl/8.7.1/20240614090648
-  core/ruby31/3.1.6/20240912144513
+  core/curl
+  core/ruby3_4
   # WARNING: Version pin managed by .expeditor/update_chef_server.sh
   "${vendor_origin}/chef-server-nginx/15.10.33/20250220085109"
   "${vendor_origin}/chef-server-ctl/15.10.33/20250220084439"
@@ -67,7 +67,7 @@ scaffolding_go_binary_list=(
 chef_automate_hab_binding_mode="relaxed"
 
 do_prepare() {
-  GO_LDFLAGS="-X main.RubyPath=$(pkg_path_for core/ruby31)"
+  GO_LDFLAGS="-X main.RubyPath=$(pkg_path_for core/ruby3_4)"
   GO_LDFLAGS="$GO_LDFLAGS -X main.ChefServerCtlPath=$(pkg_path_for chef/chef-server-ctl)"
   GO_LDFLAGS="$GO_LDFLAGS -X main.KnifePath=${pkg_prefix}/bin/knife"
   GO_LDFLAGS="$GO_LDFLAGS -X main.Version=${pkg_version}/${pkg_release}"
@@ -83,7 +83,7 @@ do_install() {
   install "$PLAN_CONTEXT/bin/knife" "$wrapper_bin_path/knife"
 
   sed -i "s!__BUILDTIME_HAB_PKG_PATH_CHEF_SERVER_CTL__!$(pkg_path_for chef/chef-server-ctl)!g" "$wrapper_bin_path/knife"
-  sed -i "s!__BUILDTIME_HAB_PKG_PATH_RUBY__!$(pkg_path_for core/ruby31)!g" "$wrapper_bin_path/knife"
+  sed -i "s!__BUILDTIME_HAB_PKG_PATH_RUBY__!$(pkg_path_for core/ruby3_4)!g" "$wrapper_bin_path/knife"
 }
 
 

diff --git a/components/automate-cs-oc-erchef/habitat/hooks/run b/components/automate-cs-oc-erchef/habitat/hooks/run
@@ -51,7 +51,7 @@ HOME="{{pkg.svc_data_path}}" BUNDLE_GEMFILE="{{pkgPathFor "chef/oc_erchef"}}/Gem
   bundle exec ruby "{{pkg.svc_config_path}}/chef_server_data_bootstrap.rb"
 
 # ruby vars are needed in order to make depselector start up
-export PATH={{pkgPathFor "core/ruby31"}}/bin:${PATH}
+export PATH={{pkgPathFor "core/ruby3_4"}}/bin:${PATH}
 export LD_LIBRARY_PATH={{pkgPathFor "core/libffi"}}/lib:${LD_LIBRARY_PATH}
 export GEM_HOME={{pkgPathFor "chef/oc_erchef"}}/vendor/bundle
 export GEM_PATH={{pkgPathFor "chef/oc_erchef"}}/vendor/bundle