Skip to content

Commit

Permalink
Updated ruby27 in automate-cs-nginx and oc_erchef run hook for fixing…
Browse files Browse the repository at this point in the history
… the chef-server-ctl issues

Signed-off-by: jan shahid shaik <jashaik@progress.com>
Signed-off-by: Kallol Roy <karoy@progress.com>
Signed-off-by: Prajakta Purohit <prajakta@chef.io>
  • Loading branch information
jashaik authored and kalroy committed Dec 21, 2021
1 parent 6322893 commit 91d3386
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .license_scout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,9 @@ fallbacks:
- name: core/ruby26
license_id: BSD-2-Clause
license_content: https://raw.githubusercontent.com/ruby/ruby/trunk/COPYING
- name: core/ruby27
license_id: BSD-2-Clause
license_content: https://raw.githubusercontent.com/ruby/ruby/trunk/COPYING
- name: core/cacerts
license_id: MPL-2.0
license_content: https://curl.haxx.se/docs/caextract.html
Expand Down
6 changes: 3 additions & 3 deletions components/automate-cs-nginx/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pkg_deps=(
# chef-server-* packages.
#
core/curl/7.68.0/20200601114640
core/ruby26/2.6.5/20200404043345
core/ruby27/2.7.0/20200404045319
# WARNING: Version pin managed by .expeditor/update_chef_server.sh
"${vendor_origin}/chef-server-nginx/14.11.15/20211206160553"
"${vendor_origin}/chef-server-ctl/14.11.15/20211206160039"
Expand Down Expand Up @@ -63,7 +63,7 @@ scaffolding_go_binary_list=(
chef_automate_hab_binding_mode="relaxed"

do_prepare() {
GO_LDFLAGS="-X main.RubyPath=$(pkg_path_for core/ruby26)"
GO_LDFLAGS="-X main.RubyPath=$(pkg_path_for core/ruby27)"
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 @@ -79,5 +79,5 @@ 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/ruby26)!g" "$wrapper_bin_path/knife"
sed -i "s!__BUILDTIME_HAB_PKG_PATH_RUBY__!$(pkg_path_for core/ruby27)!g" "$wrapper_bin_path/knife"
}
2 changes: 1 addition & 1 deletion components/automate-cs-oc-erchef/habitat/hooks/run
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,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/ruby26"}}/bin:${PATH}
export PATH={{pkgPathFor "core/ruby27"}}/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

0 comments on commit 91d3386

Please sign in to comment.