From: Javier Bértoli <jbertoli@curii.com>
Date: Thu, 8 Jul 2021 20:57:07 +0000 (-0300)
Subject: 17750: update rvm dependencies for centos-7
X-Git-Url: https://git.arvados.org/arvados-formula.git/commitdiff_plain/b71ce1c1af54b1a81771aea0e28b72191e3da9fb

17750: update rvm dependencies for centos-7

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

diff --git a/kitchen.yml b/kitchen.yml
index 57ec97b..d0ee227 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -53,22 +53,22 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:centos-7
 
-  ## SALT `3003.0`
-  - name: debian-10-3003-0-py3
+  ## SALT `3003.1`
+  - name: debian-10-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:debian-10
-  - name: debian-9-3003-0-py3
+      image: saltimages/salt-3003.1-py3:debian-10
+  - name: debian-9-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:debian-9
-  - name: ubuntu-2004-3003-0-py3
+      image: saltimages/salt-3003.1-py3:debian-9
+  - name: ubuntu-2004-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:ubuntu-20.04
-  - name: ubuntu-1804-3003-0-py3
+      image: saltimages/salt-3003.1-py3:ubuntu-20.04
+  - name: ubuntu-1804-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:ubuntu-18.04
-  - name: centos-7-3003-0-py3
+      image: saltimages/salt-3003.1-py3:ubuntu-18.04
+  - name: centos-7-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:centos-7
+      image: saltimages/salt-3003.1-py3:centos-7
 
   ## SALT `3002.6`
   - name: debian-10-3002-6-py3
@@ -173,11 +173,11 @@ suites:
         base:
           '*':
             - arvados._mapdata
+            - postgres
             - single_host.host_entries
             - single_host.snakeoil_certs
             - locale
             - nginx.passenger
-            - postgres
             - arvados.repo
             - arvados.api
             - arvados.websocket
diff --git a/test/integration/api/controls/packages_spec.rb b/test/integration/api/controls/packages_spec.rb
index 7422ceb..9cb60ab 100644
--- a/test/integration/api/controls/packages_spec.rb
+++ b/test/integration/api/controls/packages_spec.rb
@@ -10,3 +10,40 @@ control 'arvados api package' do
     it { should be_installed }
   end
 end
+
+control 'arvados cli gem' do
+  title 'should be installed'
+
+  describe gem('arvados-cli') do
+    it { should be_installed }
+  end
+end
+
+control 'RVM and dependencies' do
+  title 'should be installed'
+
+  only_if("Forced requirement for RedHat's family") do
+    os.redhat?
+  end
+
+  %w[
+    rubygem-bundler
+    curl
+    gcc
+    git
+    libcurl
+    libcurl-devel
+    pam-devel
+    postgresql-devel
+    libxml2
+    libxml2-devel
+    make
+    python3-devel
+    ruby-devel
+    zlib-devel
+  ].each do |p|
+    describe package(p) do
+      it { should be_installed }
+    end
+  end
+end
diff --git a/test/salt/pillar/examples/nginx_passenger.sls b/test/salt/pillar/examples/nginx_passenger.sls
index 404e861..8437d33 100644
--- a/test/salt/pillar/examples/nginx_passenger.sls
+++ b/test/salt/pillar/examples/nginx_passenger.sls
@@ -16,6 +16,10 @@ nginx:
   install_from_phusionpassenger: true
   lookup:
     passenger_package: {{ passenger_pkg }}
+  ### PASSENGER
+  passenger:
+    passenger_ruby: /usr/local/rvm/rubies/ruby-2.5.8/bin/ruby
+
   ### SERVER
   server:
     config: