Updating openstack CPI to ruby 3.1.2

Signed-off-by: Shwetha Gururaj <gururajsh@vmware.com>
cloudfoundry · Sep 14, 2022 · 4b4d5f3 · 4b4d5f3
1 parent beda01f
commit 4b4d5f3
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/.final_builds/packages/ruby-3.1/index.yml b/.final_builds/packages/ruby-3.1/index.yml
@@ -0,0 +1,6 @@
+builds:
+  0aaa829929c32f6bcf3e51f82c37ba0535a8007870f86fe699cd194b077dbb96:
+    version: 0aaa829929c32f6bcf3e51f82c37ba0535a8007870f86fe699cd194b077dbb96
+    blobstore_id: 828c8d2c-1c9b-4bc7-5d0d-c717bbd5e5e9
+    sha1: sha256:0797af077aaf7861e0f552ec0cd78457988eb51ef2d87ca6f45ef12eaa32ebc5
+format-version: "2"
diff --git a/jobs/openstack_cpi/spec b/jobs/openstack_cpi/spec
@@ -6,7 +6,7 @@ templates:
   cacert.pem.erb: config/cacert.pem
 
 packages:
-- ruby-3.1.0-r0.81.0
+- ruby-3.1
 - bosh_openstack_cpi
 
 properties:

diff --git a/jobs/openstack_cpi/templates/cpi.erb b/jobs/openstack_cpi/templates/cpi.erb
@@ -20,12 +20,12 @@ export no_proxy="<%= no_proxy %>"
 BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages}
 BOSH_JOBS_DIR=${BOSH_JOBS_DIR:-/var/vcap/jobs}
 
-source "${BOSH_PACKAGES_DIR}/ruby-3.1.0-r0.81.0/bosh/runtime.env"
+source "${BOSH_PACKAGES_DIR}/ruby-3.1/bosh/runtime.env"
 export HOME=~
 
 export BUNDLE_GEMFILE=$BOSH_PACKAGES_DIR/bosh_openstack_cpi/Gemfile
 
-bundle_cmd="$BOSH_PACKAGES_DIR/ruby-3.1.0-r0.81.0/bin/bundle"
+bundle_cmd="$BOSH_PACKAGES_DIR/ruby-3.1/bin/bundle"
 
 exec $bundle_cmd exec $BOSH_PACKAGES_DIR/bosh_openstack_cpi/bin/openstack_cpi \
   $BOSH_JOBS_DIR/openstack_cpi/config/cpi.json \

diff --git a/packages/bosh_openstack_cpi/packaging b/packages/bosh_openstack_cpi/packaging
@@ -4,12 +4,12 @@ set -e -x
 
 BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages}
 # shellcheck disable=SC1090
-source "${BOSH_PACKAGES_DIR}/ruby-3.1.0-r0.81.0/bosh/compile.env"
+source "${BOSH_PACKAGES_DIR}/ruby-3.1/bosh/compile.env"
 
 cp -a bosh_openstack_cpi/* "${BOSH_INSTALL_TARGET}"
 cd "${BOSH_INSTALL_TARGET}"
 
-bundle_cmd="$BOSH_PACKAGES_DIR/ruby-3.1.0-r0.81.0/bin/bundle"
+bundle_cmd="$BOSH_PACKAGES_DIR/ruby-3.1/bin/bundle"
 $bundle_cmd config set --local deployment 'true'
 $bundle_cmd config set --local no_prune 'true'
 $bundle_cmd config set --local without 'development test'

diff --git a/packages/bosh_openstack_cpi/spec b/packages/bosh_openstack_cpi/spec
@@ -1,7 +1,7 @@
 ---
 name: bosh_openstack_cpi
 dependencies:
-- ruby-3.1.0-r0.81.0
+- ruby-3.1
 files:
 - bosh_openstack_cpi/Gemfile
 - bosh_openstack_cpi/Gemfile.lock

diff --git a/packages/ruby-3.1.0-r0.81.0/spec.lock b/packages/ruby-3.1.0-r0.81.0/spec.lock
diff --git a/packages/ruby-3.1/spec.lock b/packages/ruby-3.1/spec.lock
@@ -0,0 +1,2 @@
+name: ruby-3.1
+fingerprint: 0aaa829929c32f6bcf3e51f82c37ba0535a8007870f86fe699cd194b077dbb96
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		name: ruby-3.1
		fingerprint: 0aaa829929c32f6bcf3e51f82c37ba0535a8007870f86fe699cd194b077dbb96