Merge pull request saltstack-formulas#50 from myii/fix/use-correct-su…

…se-package-and-update-ci-matrix

fix(osfamilymap): use correct package for `Suse` & update CI matrix

.travis.yml

@@ -59,26 +59,30 @@ jobs:
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
     - env: INSTANCE=default-debian-10-master-py3
+    # - env: INSTANCE=archive-debian-10-master-py3
+    # - env: INSTANCE=source-debian-10-master-py3
+    # - env: INSTANCE=repo-debian-10-master-py3
     # - env: INSTANCE=default-ubuntu-1804-master-py3
     - env: INSTANCE=default-centos-8-master-py3
-    - env: INSTANCE=default-fedora-31-master-py3
-    # env: INSTANCE=default-opensuse-leap-151-master-py3
-    # env: INSTANCE=default-amazonlinux-2-master-py3
+    # - env: INSTANCE=default-fedora-31-master-py3
+    # - env: INSTANCE=default-opensuse-leap-151-master-py3
+    # - env: INSTANCE=default-amazonlinux-2-master-py3
     # - env: INSTANCE=default-arch-base-latest-master-py2
     # - env: INSTANCE=default-debian-10-3000-1-py3
-    - env: INSTANCE=default-ubuntu-1804-master-py3
+    - env: INSTANCE=default-ubuntu-1804-3000-1-py3
     # - env: INSTANCE=default-centos-8-3000-1-py3
     # - env: INSTANCE=default-fedora-31-3000-1-py3
-    # - env: INSTANCE=default-opensuse-leap-151-3000-1-py3
+    - env: INSTANCE=default-opensuse-leap-151-3000-1-py3
     # - env: INSTANCE=default-amazonlinux-2-3000-1-py3
+    - env: INSTANCE=archive-amazonlinux-2-3000-1-py3
     # - env: INSTANCE=default-arch-base-latest-3000-1-py2
     # - env: INSTANCE=default-debian-10-2019-2-py3
     # - env: INSTANCE=default-debian-9-2019-2-py3
     # - env: INSTANCE=default-ubuntu-1804-2019-2-py3
     # - env: INSTANCE=default-ubuntu-1604-2019-2-py3
     # - env: INSTANCE=default-centos-8-2019-2-py3
     # - env: INSTANCE=default-centos-7-2019-2-py3
-    # - env: INSTANCE=default-fedora-31-2019-2-py3
+    - env: INSTANCE=default-fedora-31-2019-2-py3
     # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
     # - env: INSTANCE=default-amazonlinux-2-2019-2-py3
     # - env: INSTANCE=default-ubuntu-1804-2019-2-py2

node/osfamilymap.yaml

@@ -50,7 +50,7 @@ RedHat:
 
 Suse:
   pkg:
-    name: nodejs12
+    name: nodejs10
 
 Gentoo:
   pkg:

test/integration/default/controls/packages_spec.rb

@@ -3,7 +3,16 @@
 control 'nodejs package' do
   title 'should be installed'
 
-  describe package('nodejs') do
+  # Overide by platform
+  package_name =
+    case platform[:family]
+    when 'suse'
+      'nodejs10'
+    else
+      'nodejs'
+    end
+
+  describe package(package_name) do
     it { should be_installed }
   end
 end