Bump ruby release to ruby-2.4.6-r0.11.0

cloudfoundry · Jun 19, 2019 · d2ca392 · d2ca392
1 parent 0d97e9b
commit d2ca392
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/.final_builds/packages/ruby-2.4.6-r0.11.0/index.yml b/.final_builds/packages/ruby-2.4.6-r0.11.0/index.yml
@@ -0,0 +1,6 @@
+builds:
+  a1e381b5031f05a5b7287d4ee8a14f5a2c0bd806c73597274b6dc3edcfc8ce2a:
+    version: a1e381b5031f05a5b7287d4ee8a14f5a2c0bd806c73597274b6dc3edcfc8ce2a
+    blobstore_id: 0f19922a-f5e5-448c-5ee8-2a56021736b0
+    sha1: sha256:fdf3bde0a3a604c7c70863b6c2f697489c4c689d355571a37bb55a750cf5cc24
+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.6-r0.9.0
+- ruby-2.4.6-r0.11.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.6-r0.9.0/bosh/runtime.env"
+source "${BOSH_PACKAGES_DIR}/ruby-2.4.6-r0.11.0/bosh/runtime.env"
 export HOME=~
 
 export BUNDLE_GEMFILE=$BOSH_PACKAGES_DIR/bosh_openstack_cpi/Gemfile
 
-bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.4.6-r0.9.0/bin/bundle"
+bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.4.6-r0.11.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.6-r0.9.0/bosh/compile.env"
+source "${BOSH_PACKAGES_DIR}/ruby-2.4.6-r0.11.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.6-r0.9.0/bin/bundle"
+bundle_cmd="$BOSH_PACKAGES_DIR/ruby-2.4.6-r0.11.0/bin/bundle"
 
 cd "${BOSH_INSTALL_TARGET}"
 

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.6-r0.9.0
+- ruby-2.4.6-r0.11.0
 files:
 - bosh_openstack_cpi/Gemfile
 - bosh_openstack_cpi/Gemfile.lock

diff --git a/packages/ruby-2.4.6-r0.11.0/spec.lock b/packages/ruby-2.4.6-r0.11.0/spec.lock
@@ -0,0 +1,2 @@
+name: ruby-2.4.6-r0.11.0
+fingerprint: a1e381b5031f05a5b7287d4ee8a14f5a2c0bd806c73597274b6dc3edcfc8ce2a
diff --git a/packages/ruby-2.4.6-r0.9.0/spec.lock b/packages/ruby-2.4.6-r0.9.0/spec.lock