Skip to content

Commit

Permalink
Fix yq blob (#159)
Browse files Browse the repository at this point in the history
* add CF CLI blob to path in opensearch job

* update yq blob from darwin to linux architecture

* fix blob name
  • Loading branch information
markdboyd authored Dec 13, 2024
1 parent 95b41a3 commit fbb4818
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
8 changes: 4 additions & 4 deletions config/blobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ ruby/rake-13.0.6.gem:
size: 84992
object_id: ae89e0d2-b8d0-454f-6eff-6673b2956ada
sha: sha256:5ce4bf5037b4196c24ac62834d8db1ce175470391026bd9e557d669beeb19097
yq_darwin_amd64-4.4.6.tar.gz:
size: 4257765
object_id: 612e4c6a-d3e3-4031-5bcd-fbe5ce8ddb58
sha: sha256:88a2d9075c4f59f5e9cf6e6d1a5ec8b84fa7f094566829c76d1e80fd61da274a
yq_linux_amd64-4.44.6.tar.gz:
size: 4196529
object_id: cc6157b3-5ba0-4996-60e3-d90c8a150110
sha: sha256:09ea7643cba1cfde4c57abbadbf7fa242d7425db8ee93c0b184d68661cf3b1bd
4 changes: 3 additions & 1 deletion jobs/opensearch/templates/bin/pre-start.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ export JOB_NAME=opensearch
export OPENSEARCH_HOME=/var/vcap/packages/opensearch
export JOB_DIR=/var/vcap/jobs/$JOB_NAME
export OPENSEARCH_PATH_CONF=${JOB_DIR}/config
export OPENSEARCH_SECURITY_CONFIG_PATH=${OPENSEARCH_PATH_CONF}/opensearch-security

export YQ_PACKAGE_DIR=/var/vcap/packages/yq
export PATH=$YQ_PACKAGE_DIR/bin:$PATH
export OPENSEARCH_SECURITY_CONFIG_PATH=${OPENSEARCH_PATH_CONF}/opensearch-security
export PATH=/var/vcap/packages/cf-cli-8-linux/bin:$PATH

sysctl -q -w vm.max_map_count=262144
mkdir -p ${OPENSEARCH_HOME}/plugins
Expand Down
4 changes: 2 additions & 2 deletions packages/yq/packaging
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash

tar xzf yq_darwin_amd64-4.4.6.tar.gz -C "$BOSH_INSTALL_TARGET" --strip-components 1
tar xzf yq_linux_amd64-4.44.6.tar.gz -C "$BOSH_INSTALL_TARGET" --strip-components 1
mkdir "$BOSH_INSTALL_TARGET/bin"
cp "$BOSH_INSTALL_TARGET/yq_darwin_amd64" "$BOSH_INSTALL_TARGET/bin/yq"
cp "$BOSH_INSTALL_TARGET/yq_linux_amd64" "$BOSH_INSTALL_TARGET/bin/yq"
2 changes: 1 addition & 1 deletion packages/yq/spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
name: yq

files:
- yq_darwin_amd64-4.4.6.tar.gz
- yq_linux_amd64-4.44.6.tar.gz

0 comments on commit fbb4818

Please sign in to comment.