feat(tumbleweed): update version via. new oscodenamemap

saltstack-formulas · Jan 16, 2022 · 3ce9ef2 · 3ce9ef2
1 parent e5f9399
commit 3ce9ef2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/node/map.jinja b/node/map.jinja
@@ -7,6 +7,7 @@
 {%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap with context %}
 {%- import_yaml tplroot ~ "/osmap.yaml" as osmap with context %}
 {%- import_yaml tplroot ~ "/osfingermap.yaml" as osfingermap with context %}
+{%- import_yaml tplroot ~ "/oscodenamemap.yaml" as oscodenamemap with context %}
 
 {%- set _config = salt['config.get'](tplroot, default={}) %}
 {%- set defaults = salt['grains.filter_by'](
@@ -16,7 +17,9 @@
         merge=salt['grains.filter_by']( osfamilymap, grain='os_family',
           merge=salt['grains.filter_by']( osmap, grain='os',
             merge=salt['grains.filter_by']( osfingermap, grain='osfinger',
-              merge=salt['grains.filter_by']( _config, default='lookup'
+              merge=salt['grains.filter_by']( oscodenamemap, grain='oscodename',
+                merge=salt['grains.filter_by']( _config, default='lookup'
+                )
               )
             )
           )

diff --git a/node/oscodenamemap.yaml b/node/oscodenamemap.yaml
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+openSUSE Tumbleweed:
+  pkg:
+    name: nodejs16
diff --git a/test/integration/default/controls/packages_spec.rb b/test/integration/default/controls/packages_spec.rb
@@ -7,7 +7,12 @@
   package_name =
     case platform[:family]
     when 'suse'
-      'nodejs14'
+      case system.platform[:finger]
+      when 'opensuse-tumbleweed'
+        'nodejs16'
+      else
+        'nodejs14'
+      end
     else
       'nodejs'
     end