X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/fd654a4138340c1ddb0dcc5a406ede4b7c62b13f..4bf9501a14f86845865244ee3ffb03a34707d36c:/arvados/shell/package/install.sls

diff --git a/arvados/shell/package/install.sls b/arvados/shell/package/install.sls
index b9263f4..d2de401 100644
--- a/arvados/shell/package/install.sls
+++ b/arvados/shell/package/install.sls
@@ -3,21 +3,35 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
+{%- set sls_ruby_install = tplroot ~ '.ruby.package.install' %}
 {%- from tplroot ~ "/map.jinja" import arvados with context %}
 
-arvados-shell-package-install-pkg-installed:
-  pkg.installed:
-    - pkgs: {{ arvados.shell.pkg.name | json }}
+include:
+  - {{ sls_ruby_install }}
 
-arvados-shell-package-install-ruby-pkg-installed:
+arvados-shell-package-install-pkg-installed:
   pkg.installed:
-    - name: {{ arvados.ruby.pkg }}
-    - only_if: {{ arvados.ruby.manage_ruby }}
+    - pkgs:
+      {%- for package in arvados.shell.pkg.name %}
+        # We use version for our Arvados packages only
+        {%- if package in [
+          'arvados-client',
+          'arvados-src',
+          'libpam-arvados-go',
+          'python3-arvados-fuse',
+          'python3-arvados-python-client',
+          'python3-arvados-cwl-runner',
+        ] %}
+      - {{ package }}: {{ arvados.version }}
+        {%- else %}
+      - {{ package }}
+        {%- endif %}
+      {%- endfor %}
 
 arvados-shell-package-install-gems-deps-pkg-installed:
   pkg.installed:
     - pkgs: {{ arvados.ruby.gems_deps | json }}
-    - only_if: {{ arvados.ruby.manage_gems_deps }}
+    - only_if: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
 
 {% for gm in arvados.shell.gem.name %}
 arvados-shell-package-install-gem-{{ gm }}-installed:
@@ -25,4 +39,14 @@ arvados-shell-package-install-gem-{{ gm }}-installed:
     - name: {{ gm }}
     - require:
       - pkg: arvados-shell-package-install-gems-deps-pkg-installed
+      {%- if arvados.ruby.manage_ruby %}
+        {%- if salt['grains.get']('osfinger') != 'CentOS Linux-7' %}
+      - pkg: arvados-ruby-package-install-ruby-pkg-installed
+        {%- else %}
+      # - rvm: arvados-ruby-package-install-ruby-gemset-present
+      - rvm: arvados-ruby-package-install-ruby-rvm-installed
+      # - rvm: gemset_present
+    # - ruby: ruby-2.5.7@arvados
+        {%- endif %}
+      {%- endif %}
 {% endfor %}