Skip to content
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

DO NOT MERGE | changes required in CS components to build automate via LTS channel #8770

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

DO NOT MERGE | changes required in CS components to build automate via LTS channel #8770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
275a1b3
resolving multiple dependencies in erchef.
talktovikas Jan 28, 2025
3c7e2ce
fixing nginx dependencies.
talktovikas Jan 28, 2025
69afb69
removed the version from erchef comps.
talktovikas Feb 3, 2025
11e3b09
pinning version in erchef to remove transitive deps.
talktovikas Feb 3, 2025
0e21962
pinning version.
talktovikas Feb 3, 2025
a34a4fa
unpining comps in cs- nginx
talktovikas Feb 3, 2025
4430c5f
chaning ruby31 to ruby ruby3_1 in nginx.
talktovikas Feb 3, 2025
5428be3
pinning nginx changes.
talktovikas Feb 3, 2025
dc93c83
fixing ruby path
talktovikas Feb 3, 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.27"
pkg_deps=(
core/coreutils/8.32/20240105213308
chef/mlsa/1.0.1/20240125084021
core/coreutils/9.4/20241017111752
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/8.7.1/20241017131032
core/ruby3_1/3.1.6/20250115100930
# WARNING: Version pin managed by .expeditor/update_chef_server.sh
"${vendor_origin}/chef-server-nginx/15.10.27/20250102025712"
"${vendor_origin}/chef-server-ctl/15.10.27/20250102025130"
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
6 changes: 3 additions & 3 deletions 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,16 +18,16 @@ 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
chef/mlsa/1.0.1/20240125084021
core/runit/2.1.2/20241018035314 #glic 2.36
chef/mlsa
#"${local_platform_tools_origin:-chef}/automate-platform-tools"
chef/automate-platform-tools/0.1.0/20241212061203
# WARNING: Version pin managed by .expeditor/update_chef_server.sh
"${vendor_origin}/oc_erchef/15.10.27/20250102025130"
)

pkg_build_deps=(
core/gcc
core/gcc/12.2.0/20241017105633
)

pkg_binds=(
Expand Down