Use version of ruby 2.6 with rubygems 2.7

rubygems 3.0 introduced a bug so that no version of bundler could install the pg gem correctly. We are temporarily rolling back to rubygems 2.7 until the bug is fixed. See rubygems/bundler#6940 for more details [#164713288](https://www.pivotaltracker.com/story/show/164713288) Co-authored-by: Belinda Liu <[email protected]>
cloudfoundry · Jul 9, 2019 · 13d513f · 13d513f
1 parent 239faa0
commit 13d513f
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 12 deletions.
diff --git a/.final_builds/packages/ruby-2.6.3-r0.17.0/index.yml b/.final_builds/packages/ruby-2.6.3-r0.17.0/index.yml
@@ -0,0 +1,6 @@
+builds:
+  43ece8981ebd9e0979f482c95330e71ce671b211ab6268449466158ba3cbf0a3:
+    version: 43ece8981ebd9e0979f482c95330e71ce671b211ab6268449466158ba3cbf0a3
+    blobstore_id: 8774fe6e-facb-475a-5216-ddc4d7067a26
+    sha1: sha256:c5985bb1601ae7c3c64027079eb124e92b230dafafe7f7ed90e4e5ba95f1f8dd
+format-version: "2"
diff --git a/jobs/director/spec b/jobs/director/spec
@@ -45,7 +45,7 @@ packages:
 - libpq
 - postgres-9.4
 - mysql
-- ruby-2.6.3-r0.14.0
+- ruby-2.6.3-r0.17.0
 - s3cli
 - davcli
 - bosh-gcscli

diff --git a/jobs/director/templates/env.erb b/jobs/director/templates/env.erb
@@ -1,4 +1,4 @@
-source /var/vcap/packages/ruby-2.6.3-r0.14.0/bosh/runtime.env
+source /var/vcap/packages/ruby-2.6.3-r0.17.0/bosh/runtime.env
 export BUNDLE_GEMFILE=/var/vcap/packages/director/Gemfile
 export GEM_HOME=/var/vcap/packages/director/gem_home/ruby/2.6.0
 

diff --git a/jobs/health_monitor/spec b/jobs/health_monitor/spec
@@ -11,7 +11,7 @@ templates:
 
 packages:
   - health_monitor
-  - ruby-2.6.3-r0.14.0
+  - ruby-2.6.3-r0.17.0
 
 properties:
   #

diff --git a/jobs/health_monitor/templates/health_monitor_ctl.erb b/jobs/health_monitor/templates/health_monitor_ctl.erb
@@ -7,7 +7,7 @@ RUNAS=vcap
 CONFIG_DIR=/var/vcap/jobs/health_monitor/config
 STORE_DIR=/var/vcap/store/health_monitor
 
-source /var/vcap/packages/ruby-2.6.3-r0.14.0/bosh/runtime.env
+source /var/vcap/packages/ruby-2.6.3-r0.17.0/bosh/runtime.env
 export GEM_HOME=/var/vcap/packages/health_monitor/gem_home/ruby/2.6.0
 export BUNDLE_GEMFILE=/var/vcap/packages/health_monitor/Gemfile
 

diff --git a/jobs/registry/spec b/jobs/registry/spec
@@ -16,7 +16,7 @@ packages:
   - registry
   - libpq
   - mysql
-  - ruby-2.6.3-r0.14.0
+  - ruby-2.6.3-r0.17.0
 
 properties:
   registry.port:

diff --git a/jobs/registry/templates/registry b/jobs/registry/templates/registry
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-source /var/vcap/packages/ruby-2.6.3-r0.14.0/bosh/runtime.env
+source /var/vcap/packages/ruby-2.6.3-r0.17.0/bosh/runtime.env
 exec /var/vcap/jobs/registry/bin/bosh-registry
diff --git a/packages/director/packaging b/packages/director/packaging
@@ -5,7 +5,7 @@ mkdir -p ${BOSH_INSTALL_TARGET}/{bin,gem_home}
 libpq_dir=/var/vcap/packages/libpq
 mysqlclient_dir=/var/vcap/packages/mysql
 
-source /var/vcap/packages/ruby-2.6.3-r0.14.0/bosh/compile.env
+source /var/vcap/packages/ruby-2.6.3-r0.17.0/bosh/compile.env
 
 for gemspec in $( find . -maxdepth 2 -name *.gemspec ); do
   gem_name="$( basename "$( dirname "$gemspec" )" )"

diff --git a/packages/director/spec b/packages/director/spec
@@ -4,7 +4,7 @@ name: director
 dependencies:
 - libpq
 - mysql
-- ruby-2.6.3-r0.14.0
+- ruby-2.6.3-r0.17.0
 
 files:
 - bosh-director/**/*

diff --git a/packages/health_monitor/packaging b/packages/health_monitor/packaging
@@ -2,7 +2,7 @@ set -e
 
 mkdir -p ${BOSH_INSTALL_TARGET}/{bin,gem_home}
 
-source /var/vcap/packages/ruby-2.6.3-r0.14.0/bosh/compile.env
+source /var/vcap/packages/ruby-2.6.3-r0.17.0/bosh/compile.env
 
 cat > Gemfile <<EOF
 # Explicitly require vendored version to avoid requiring builtin json gem

diff --git a/packages/health_monitor/spec b/packages/health_monitor/spec
@@ -1,7 +1,7 @@
 ---
 name: health_monitor
 dependencies:
-- ruby-2.6.3-r0.14.0
+- ruby-2.6.3-r0.17.0
 
 files:
 - bosh-monitor/**/*

diff --git a/packages/registry/packaging b/packages/registry/packaging
@@ -4,7 +4,7 @@ mkdir -p ${BOSH_INSTALL_TARGET}/{bin,gem_home}
 
 libpq_dir=/var/vcap/packages/libpq
 mysqlclient_dir=/var/vcap/packages/mysql
-source /var/vcap/packages/ruby-2.6.3-r0.14.0/bosh/compile.env
+source /var/vcap/packages/ruby-2.6.3-r0.17.0/bosh/compile.env
 
 for gemspec in $( find . -maxdepth 2 -name *.gemspec ); do
   gem_name="$( basename "$( dirname "$gemspec" )" )"

diff --git a/packages/registry/spec b/packages/registry/spec
@@ -3,7 +3,7 @@ name: registry
 dependencies:
 - libpq
 - mysql
-- ruby-2.6.3-r0.14.0
+- ruby-2.6.3-r0.17.0
 
 files:
 - bosh_common/**/*

diff --git a/packages/ruby-2.6.3-r0.17.0/spec.lock b/packages/ruby-2.6.3-r0.17.0/spec.lock
@@ -0,0 +1,2 @@
+name: ruby-2.6.3-r0.17.0
+fingerprint: 43ece8981ebd9e0979f482c95330e71ce671b211ab6268449466158ba3cbf0a3