Update ruby version used with RVM on Centos 7

This fixes bundler's version issues with passenger, api and workbench

no issue #
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

diff --git a/arvados/osfamilymap.yaml b/arvados/osfamilymap.yaml
index fae57b63ba3f20eb75cccf73784292dc62bbb800..22516a4b48eb33e06ad001bf352d4130dd0fcb1f 100644 (file)
--- a/arvados/osfamilymap.yaml
+++ b/arvados/osfamilymap.yaml
@@ -30,9 +30,8 @@ RedHat:
     manage_ruby: true
     use_rvm: true
 
     manage_ruby: true
     use_rvm: true
 

-    pkg: ruby-2.5.8
+    pkg: ruby-2.7.2

     gems_deps:
     gems_deps:

-      - rubygem-bundler

       - curl
       - gcc
       - git
       - curl
       - gcc
       - git

diff --git a/arvados/ruby/package/install.sls b/arvados/ruby/package/install.sls
index 8d9ed6b2f816292983dc9ec315fdf73a2281e1bc..56cef4766166b922ba022d41bfd88cf13373d35f 100644 (file)
--- a/arvados/ruby/package/install.sls
+++ b/arvados/ruby/package/install.sls
@@ -18,9 +18,8 @@
 arvados-ruby-package-install-ruby-rvm-deps-centos-scl-release-pkg-installed:
   pkg.installed:
     - name: centos-release-scl
 arvados-ruby-package-install-ruby-rvm-deps-centos-scl-release-pkg-installed:
   pkg.installed:
     - name: centos-release-scl

-    - require_in:

 
 

-arvados-ruby-package-install-ruby-rvm-deps-rh-postgres11-libs-pkg-installed:
+arvados-ruby-package-install-ruby-rvm-deps-rh-postgres-libs-pkg-installed:

   pkg.installed:
     - name: rh-postgresql{{ arvados.api.postgresql_version }}-postgresql-libs
     - unless: rpm -q postgresql{{ arvados.api.postgresql_version }}-libs
   pkg.installed:
     - name: rh-postgresql{{ arvados.api.postgresql_version }}-postgresql-libs
     - unless: rpm -q postgresql{{ arvados.api.postgresql_version }}-libs


@@ -63,5 +62,6 @@ arvados-ruby-package-install-ruby-rvm-installed:
 arvados-ruby-package-install-ruby-pkg-installed:
   pkg.installed:
     - name: {{ arvados.ruby.pkg }}
 arvados-ruby-package-install-ruby-pkg-installed:
   pkg.installed:
     - name: {{ arvados.ruby.pkg }}

+

   {%- endif %}
 {%- endif %}
   {%- endif %}
 {%- endif %}

diff --git a/test/integration/api/controls/packages_spec.rb b/test/integration/api/controls/packages_spec.rb
index edc206049bbc6e056a3c1859e8d8899ec5976934..804b2746a587631c6644b942f08b498b85c32a4c 100644 (file)
--- a/test/integration/api/controls/packages_spec.rb
+++ b/test/integration/api/controls/packages_spec.rb
@@ -40,7 +40,6 @@ control 'RVM and dependencies' do
     pam-devel
     postgresql12-libs
     python3-devel
     pam-devel
     postgresql12-libs
     python3-devel

-    rubygem-bundler

     zlib-devel
   ].each do |p|
     describe package(p) do
     zlib-devel
   ].each do |p|
     describe package(p) do


@@ -49,6 +48,6 @@ control 'RVM and dependencies' do
   end
   describe command('/usr/local/rvm/bin/rvm list') do
     its(:exit_status) { should eq 0 }
   end
   describe command('/usr/local/rvm/bin/rvm list') do
     its(:exit_status) { should eq 0 }

-    its('stdout') { should match(/ruby-2.5.8/) }
+    its('stdout') { should match(/ruby-2.7.2/) }

   end
 end
   end
 end

diff --git a/test/salt/pillar/examples/nginx_passenger.sls b/test/salt/pillar/examples/nginx_passenger.sls
index 7091e28cc9da5818d4120118abc3cb1d2f2fe206..fcd9e6afc06ae9545aba4b0768f6919ec550fecb 100644 (file)
--- a/test/salt/pillar/examples/nginx_passenger.sls
+++ b/test/salt/pillar/examples/nginx_passenger.sls
@@ -6,7 +6,7 @@
 {%- if grains.os_family in ('RedHat',) %}
   {%- set passenger_pkg = 'nginx-mod-http-passenger' %}
   {%- set passenger_mod = '/usr/lib64/nginx/modules/ngx_http_passenger_module.so' %}
 {%- if grains.os_family in ('RedHat',) %}
   {%- set passenger_pkg = 'nginx-mod-http-passenger' %}
   {%- set passenger_mod = '/usr/lib64/nginx/modules/ngx_http_passenger_module.so' %}

-  {%- set passenger_ruby = '/usr/local/rvm/rubies/ruby-2.5.8/bin/ruby' %}
+  {%- set passenger_ruby = '/usr/local/rvm/rubies/ruby-2.7.2/bin/ruby' %}

 {%- else %}
   {%- set passenger_pkg = 'libnginx-mod-http-passenger' %}
   {%- set passenger_mod = '/usr/lib/nginx/modules/ngx_http_passenger_module.so' %}
 {%- else %}
   {%- set passenger_pkg = 'libnginx-mod-http-passenger' %}
   {%- set passenger_mod = '/usr/lib/nginx/modules/ngx_http_passenger_module.so' %}