-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Upgrading to ocid 15.8.0 in Automate (#8248)"
This reverts commit 65346bd.
- Loading branch information
1 parent
675a588
commit c15fc93
Showing
2 changed files
with
20 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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.8.0" | ||
pkg_version="15.4.0" | ||
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.8.0/20230929110850" | ||
"${vendor_origin}/oc_id/15.4.0/20230105061030" | ||
) | ||
|
||
pkg_binds=( | ||
|
@@ -38,11 +38,28 @@ 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 | ||
} | ||
|
||
|