Updated with 15.9.14 before release testing

Signed-off-by: jan shahid shaik <[email protected]>

components/automate-cs-bookshelf/habitat/plan.sh

@@ -7,7 +7,7 @@ pkg_name="automate-cs-bookshelf"
 pkg_description="Wrapper package for chef/bookshelf"
 pkg_origin="chef"
 # WARNING: Version managed by .expeditor/update_chef_server.sh
-pkg_version="15.9.12"
+pkg_version="15.9.14"
 vendor_origin="chef"
 pkg_maintainer="Chef Software Inc. <[email protected]>"
 pkg_license=("Chef-MLSA")
@@ -16,7 +16,7 @@ pkg_deps=(
   chef/mlsa
   "${local_platform_tools_origin:-chef}/automate-platform-tools"
   # WARNING: Version pin managed by .expeditor/update_chef_server.sh
-  "${vendor_origin}/bookshelf/15.9.12/20231127093445"
+  "${vendor_origin}/bookshelf/15.9.14/20231205125634"
 )
 
 pkg_binds=(

components/automate-cs-nginx/habitat/plan.sh

@@ -8,7 +8,7 @@ vendor_origin="chef"
 pkg_maintainer="Chef Software Inc. <[email protected]>"
 pkg_license=('Chef-MLSA')
 # WARNING: Version managed by .expeditor/update_chef_server.sh
-pkg_version="15.9.12"
+pkg_version="15.9.14"
 pkg_deps=(
   core/coreutils
   chef/mlsa
@@ -21,8 +21,8 @@ pkg_deps=(
   core/curl
   core/ruby27
   # WARNING: Version pin managed by .expeditor/update_chef_server.sh
-  "${vendor_origin}/chef-server-nginx/15.9.12/20231127094028"
-  "${vendor_origin}/chef-server-ctl/15.9.12/20231127093445"
+  "${vendor_origin}/chef-server-nginx/15.9.14/20231205130147"
+  "${vendor_origin}/chef-server-ctl/15.9.14/20231205125634"
 )
 
 pkg_bin_dirs=(bin)

components/automate-cs-oc-bifrost/habitat/plan.sh

@@ -7,7 +7,7 @@ pkg_name="automate-cs-oc-bifrost"
 pkg_description="Wrapper package for chef/oc_bifrost"
 pkg_origin="chef"
 # WARNING: Version managed by .expeditor/update_chef_server.sh
-pkg_version="15.9.12"
+pkg_version="15.9.14"
 vendor_origin="chef"
 pkg_maintainer="Chef Software Inc. <[email protected]>"
 pkg_license=("Chef-MLSA")
@@ -16,7 +16,7 @@ pkg_deps=(
   chef/mlsa
   "${local_platform_tools_origin:-chef}/automate-platform-tools"
   # WARNING: Version pin managed by .expeditor/update_chef_server.sh
-  "${vendor_origin}/oc_bifrost/15.9.12/20231127093445"
+  "${vendor_origin}/oc_bifrost/15.9.14/20231205125634"
 )
 
 pkg_binds=(

components/automate-cs-oc-erchef/habitat/plan.sh

@@ -7,7 +7,7 @@ pkg_name="automate-cs-oc-erchef"
 pkg_description="Wrapper package for chef/oc_erchef"
 pkg_origin="chef"
 # WARNING: Version managed by .expeditor/update_chef_server.sh
-pkg_version="15.9.12"
+pkg_version="15.9.14"
 vendor_origin="chef"
 pkg_maintainer="Chef Software Inc. <[email protected]>"
 pkg_license=("Chef-MLSA")
@@ -18,7 +18,7 @@ pkg_deps=(
   chef/mlsa
   "${local_platform_tools_origin:-chef}/automate-platform-tools"
   # WARNING: Version pin managed by .expeditor/update_chef_server.sh
-  "${vendor_origin}/oc_erchef/15.9.12/20231127093445"
+  "${vendor_origin}/oc_erchef/15.9.14/20231205125641"
 )
 
 pkg_build_deps=(

components/automate-cs-ocid/habitat/plan.sh

@@ -7,7 +7,7 @@ pkg_name="automate-cs-ocid"
 pkg_description="Wrapper package for chef/ocid"
 pkg_origin="chef"
 # WARNING: Version managed by .expeditor/update_chef_server.sh
-pkg_version="15.4.0"
+pkg_version="15.9.14"
 vendor_origin="chef"
 pkg_maintainer="Chef Software Inc. <[email protected]>"
 pkg_license=("Chef-MLSA")
@@ -21,7 +21,7 @@ pkg_deps=(
   chef/mlsa
   "${local_platform_tools_origin:-chef}/automate-platform-tools"
   # WARNING: Version pin managed by .expeditor/update_chef_server.sh
-  "${vendor_origin}/oc_id/15.4.0/20230105061030"
+  "${vendor_origin}/oc_id/15.9.14/20231205125634"
 )
 
 pkg_binds=(
@@ -38,28 +38,11 @@ pkg_exposes=(http-port)
 pkg_scaffolding="${local_scaffolding_origin:-chef}/automate-scaffolding"
 automate_scaffolding_include_templates=(sqerl.config)
 
-do_prepare() {
-  GO_LDFLAGS="-X main.RubyPath=$(hab pkg path 'core/ruby27')"
-  export GO_LDFLAGS
-
-  build_line "Setting link for /usr/bin/env to 'coreutils'"
-  [[ ! -f /usr/bin/env ]] && ln -s "$(pkg_path_for coreutils)/bin/env" /usr/bin/env
-  return 0
-}
-
 do_download() {
   return 0
 }
 
 do_build() {
-  # TODO :: Remove following section once new ocid hab package is used which includes gem: "tzinfo-data"
-  cd $(pkg_path_for "chef/oc_id")/oc_id
-  bundle config path "vendor/bundle"
-  if ! grep -q "gem 'tzinfo-data'" Gemfile; then
-    echo "gem 'tzinfo-data'" >> Gemfile
-    bundle install
-  fi
-
   return 0
 }