Skip to content

LTS-channel upgrade for chef-server #8954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

LTS-channel upgrade for chef-server #8954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
894f5ee
removing chef-server components dependency pinning.
sreepuramsudheer Aug 11, 2025
4de22c3
Pinning core/runit for testing.
sreepuramsudheer Aug 12, 2025
7047dae
changing core/ruby31 to core/ruby3_1
sreepuramsudheer Aug 12, 2025
21a1739
replacing remaining core/ruby31 in automate-cs-nginx plan.sh
sreepuramsudheer Aug 12, 2025
1278e25
changing ruby path from ruby31 to ruby3_1
sreepuramsudheer Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions components/automate-cs-nginx/habitat/plan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_1/3.1.7
# 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"
Expand Down Expand Up @@ -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_1)"
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}"
Expand All @@ -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_1)!g" "$wrapper_bin_path/knife"
}


Expand Down
2 changes: 1 addition & 1 deletion components/automate-cs-oc-erchef/habitat/hooks/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_1"}}/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
Expand Down
3 changes: 2 additions & 1 deletion components/automate-cs-oc-erchef/habitat/plan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ pkg_license=("Chef-MLSA")
pkg_upstream_url="https://www.chef.io/automate"
pkg_deps=(
#core/runit/2.1.2/20200403133549
core/runit/2.1.2/20240106064032
#core/runit
core/runit/2.1.2/20250529014245
chef/mlsa
#"${local_platform_tools_origin:-chef}/automate-platform-tools"
chef/automate-platform-tools
Expand Down
Loading