From: Javier Bértoli <jbertoli@curii.com>
Date: Thu, 5 Aug 2021 18:04:19 +0000 (-0300)
Subject: Merge branch 'fix-rvm-deps-in-centos'
X-Git-Url: https://git.arvados.org/arvados-formula.git/commitdiff_plain/777d2c8805938b1f12ee69acf317e373acfaa430?hp=ad8af2094ca06d93dba1f61f3e96587b12e7f667

Merge branch 'fix-rvm-deps-in-centos'

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

diff --git a/arvados/osfamilymap.yaml b/arvados/osfamilymap.yaml
index fae57b6..22516a4 100644
--- a/arvados/osfamilymap.yaml
+++ b/arvados/osfamilymap.yaml
@@ -30,9 +30,8 @@ RedHat:
     manage_ruby: true
     use_rvm: true
 
-    pkg: ruby-2.5.8
+    pkg: ruby-2.7.2
     gems_deps:
-      - rubygem-bundler
       - curl
       - gcc
       - git
diff --git a/arvados/ruby/package/install.sls b/arvados/ruby/package/install.sls
index 8d9ed6b..56cef47 100644
--- 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
-    - 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
@@ -63,5 +62,6 @@ arvados-ruby-package-install-ruby-rvm-installed:
 arvados-ruby-package-install-ruby-pkg-installed:
   pkg.installed:
     - name: {{ arvados.ruby.pkg }}
+
   {%- endif %}
 {%- endif %}
diff --git a/test/integration/api/controls/packages_spec.rb b/test/integration/api/controls/packages_spec.rb
index edc2060..804b274 100644
--- 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
-    rubygem-bundler
     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 }
-    its('stdout') { should match(/ruby-2.5.8/) }
+    its('stdout') { should match(/ruby-2.7.2/) }
   end
 end
diff --git a/test/salt/pillar/examples/nginx_passenger.sls b/test/salt/pillar/examples/nginx_passenger.sls
index 7091e28..fcd9e6a 100644
--- 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' %}
-  {%- 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' %}