18849: enforce RVM on Debian 10

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

diff --git a/arvados/osfingermap.yaml b/arvados/osfingermap.yaml
index b454916747c03983f6692618dc1c697b8f93614a..d43576725b7d1e02bd3ee2665a9d4070e21db26f 100644 (file)
--- a/arvados/osfingermap.yaml
+++ b/arvados/osfingermap.yaml
@@ -23,3 +23,25 @@ Ubuntu-18.04:
       - python3-dev
       - ruby-dev
       - zlib1g-dev
+
+Debian-10:
+  ruby:
+    manage_ruby: true
+    use_rvm: true
+
+    pkg: ruby-2.7.2
+    gems_deps:
+      - curl
+      - g++
+      - gcc
+      - git
+      - libcurl4
+      - libcurl4-gnutls-dev
+      - libpam0g-dev
+      - libpq-dev
+      - libxml2
+      - libxml2-dev
+      - make
+      - python3-dev
+      - ruby-dev
+      - zlib1g-dev

diff --git a/test/integration/api/controls/packages_spec.rb b/test/integration/api/controls/packages_spec.rb
index 969bf0752f16052d8ac2d5c28d68cd163a2ed002..1799a4b58ab4264b62987fdb24ec10f12f7ff85f 100644 (file)
--- a/test/integration/api/controls/packages_spec.rb
+++ b/test/integration/api/controls/packages_spec.rb
@@ -43,9 +43,10 @@ end
 control 'RVM ruby manager' do
   title 'should be installed'
 
-  only_if('Forced requirement for Centos-7 and Ubuntu-18.04') do
+  only_if('Forced requirement for Centos-7, Ubuntu-18.04 and Debian-10') do
     (os.redhat? and platform[:release].to_f.truncate == 7) or
-      (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18)
+      (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18) or
+      (os.name == 'debian' and platform[:release].to_f.truncate == 10)
   end
 
   describe command('/usr/local/rvm/bin/rvm list') do
@@ -57,9 +58,10 @@ end
 control 'arvados cli gem' do
   title 'should be installed'
 
-  only_if('Skipped in Centos-7 and Ubuntu-18.04') do
+  only_if('Skipped in Centos-7, Ubuntu-18.04 and Debian-10') do
     !((os.redhat? and platform[:release].to_f.truncate == 7) or
-    (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18))
+    (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18) or
+    (os.name == 'debian' and platform[:release].to_f.truncate == 10))
   end
 
   describe gem('arvados-cli') do
@@ -70,9 +72,10 @@ end
 control 'RVM arvados cli gem' do
   title 'should be installed'
 
-  only_if('Forced requirement for Centos-7 and Ubuntu-18.04') do
+  only_if('Forced requirement for Centos-7, Ubuntu-18.04 and Debian-10') do
     (os.redhat? and platform[:release].to_f.truncate == 7) or
-      (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18)
+      (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18) or
+      (os.name == 'debian' and platform[:release].to_f.truncate == 10)
   end
 
   describe gem('arvados-cli', '/usr/local/rvm/bin/rvm all do gem') do

diff --git a/test/integration/shell/controls/packages_spec.rb b/test/integration/shell/controls/packages_spec.rb
index ac58157309f9c6f9c0bbd27085611873e8811bd4..9d52c1239acaca68b59a27d29464135093f611d7 100644 (file)
--- a/test/integration/shell/controls/packages_spec.rb
+++ b/test/integration/shell/controls/packages_spec.rb
@@ -41,9 +41,10 @@ end
 control 'arvados shell gems' do
   title 'should be installed'
 
-  only_if('Skipped in Centos-7 and Ubuntu-18.04') do
+  only_if('Skipped in Centos-7, Ubuntu-18.04 and Debian-10') do
     !((os.redhat? and platform[:release].to_f.truncate == 7) or
-    (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18))
+    (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18) or
+    (os.name == 'debian' and platform[:release].to_f.truncate == 10))
   end
 
   describe gem('arvados-cli') do
@@ -54,9 +55,10 @@ end
 control 'RVM arvados shell gems' do
   title 'should be installed'
 
-  only_if('Forced requirement for Centos-7 and Ubuntu-18.04') do
+  only_if('Forced requirement for Centos-7, Ubuntu-18.04 and Debian-10') do
     (os.redhat? and platform[:release].to_f.truncate == 7) or
-      (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18)
+      (os.name == 'ubuntu' and platform[:release].to_f.truncate == 18) or
+      (os.name == 'debian' and platform[:release].to_f.truncate == 10)
   end
 
   describe gem('arvados-cli', '/usr/local/rvm/bin/rvm all do gem') do

diff --git a/test/salt/pillar/examples/nginx_passenger.sls b/test/salt/pillar/examples/nginx_passenger.sls
index 63ca49776c75281add1760b0b8e40705297ffe31..33699cdcb0d50a666a3c2ded35c5e39de87e2cac 100644 (file)
--- a/test/salt/pillar/examples/nginx_passenger.sls
+++ b/test/salt/pillar/examples/nginx_passenger.sls
@@ -10,7 +10,7 @@
                           if grains.osfinger in ('CentOS Linux-7',) else
                         '/usr/lib/nginx/modules/ngx_http_passenger_module.so' %}
 {%- set passenger_ruby = '/usr/local/rvm/rubies/ruby-2.7.2/bin/ruby'
-                           if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04',) else
+                           if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04', 'Debian-10') else
                          '/usr/bin/ruby' %}
 
 ### NGINX