Update to ruby-2.7 [fixes #238]

cloudfoundry · Oct 7, 2021 · eba7ab2 · eba7ab2
1 parent 655b3ac
commit eba7ab2
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 10 deletions.
diff --git a/.final_builds/packages/ruby-2.7.4-r0.66.0/index.yml b/.final_builds/packages/ruby-2.7.4-r0.66.0/index.yml
@@ -0,0 +1,6 @@
+builds:
+  f22ee71db5662ea66c48fd9d934b94fd9671f87e94cf3d344f5e2cea36ae0089:
+    version: f22ee71db5662ea66c48fd9d934b94fd9671f87e94cf3d344f5e2cea36ae0089
+    blobstore_id: 43f3f7f8-ee66-4efb-7808-a7e8c64558e0
+    sha1: sha256:0ebc0e4a160ea20b4e398baf9d50f40b24c2b4db2d96675e24ceba7b5e00700c
+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-2.4.9-r0.27.0
+- ruby-2.7.4-r0.66.0
 - 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-2.4.9-r0.27.0/bosh/runtime.env"
+source "${BOSH_PACKAGES_DIR}/ruby-2.7.4-r0.66.0/bosh/runtime.env"
 export HOME=~
 
 export BUNDLE_GEMFILE=$BOSH_PACKAGES_DIR/bosh_openstack_cpi/Gemfile
 
-bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.4.9-r0.27.0/bin/bundle"
+bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.7.4-r0.66.0/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,13 +4,13 @@ set -e -x
 
 BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages}
 # shellcheck disable=SC1090
-source "${BOSH_PACKAGES_DIR}/ruby-2.4.9-r0.27.0/bosh/compile.env"
+source "${BOSH_PACKAGES_DIR}/ruby-2.7.4-r0.66.0/bosh/compile.env"
 
 cp -a bosh_openstack_cpi/* "${BOSH_INSTALL_TARGET}"
 
 export BUNDLE_CACHE_PATH="vendor/package"
 export BUNDLE_WITHOUT="development:test"
-bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.4.9-r0.27.0/bin/bundle"
+bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.7.4-r0.66.0/bin/bundle"
 
 cd "${BOSH_INSTALL_TARGET}"
 

diff --git a/packages/bosh_openstack_cpi/pre_packaging b/packages/bosh_openstack_cpi/pre_packaging
@@ -7,7 +7,7 @@ export BUNDLE_CACHE_PATH="vendor/package"
 export BUNDLE_WITHOUT="development:test"
 
 pushd ${BUILD_DIR}/bosh_openstack_cpi
-  bundle package --all --no-install
+  bundle package --all-platforms --no-install
 popd
 
 rm -rf $BUNDLE_APP_CONFIG
diff --git a/packages/bosh_openstack_cpi/spec b/packages/bosh_openstack_cpi/spec
@@ -1,7 +1,7 @@
 ---
 name: bosh_openstack_cpi
 dependencies:
-- ruby-2.4.9-r0.27.0
+- ruby-2.7.4-r0.66.0
 files:
 - bosh_openstack_cpi/Gemfile
 - bosh_openstack_cpi/Gemfile.lock

diff --git a/packages/ruby-2.4.9-r0.27.0/spec.lock b/packages/ruby-2.4.9-r0.27.0/spec.lock
diff --git a/packages/ruby-2.7.4-r0.66.0/spec.lock b/packages/ruby-2.7.4-r0.66.0/spec.lock
@@ -0,0 +1,2 @@
+name: ruby-2.7.4-r0.66.0
+fingerprint: f22ee71db5662ea66c48fd9d934b94fd9671f87e94cf3d344f5e2cea36ae0089
diff --git a/src/bosh_openstack_cpi/Gemfile.lock b/src/bosh_openstack_cpi/Gemfile.lock
@@ -120,4 +120,4 @@ DEPENDENCIES
   webmock (~> 2.3.2)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4