Merge pull request #467 from myii/ci/add-opensuse-leap-15.2

ci(kitchen+travis): adjust matrix to add `opensuse-leap-15.2`

.travis.yml

@@ -64,7 +64,8 @@ jobs:
     - env: INSTANCE=v3000-py3-centos-8-3000-3-py3
     # - env: INSTANCE=v3000-py3-centos-7-3000-3-py3
     - env: INSTANCE=v3000-py3-fedora-31-3000-3-py3
-    # - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-3-py3
+    - env: INSTANCE=v3000-py3-opensuse-leap-152-3000-3-py3
+    - env: INSTANCE=v3000-py3-opensuse-leap-151-3000-3-py3
     - env: INSTANCE=v3000-py3-amazonlinux-2-3000-3-py3
     - env: INSTANCE=v3000-py2-ubuntu-1804-3000-3-py2
     # - env: INSTANCE=v3000-py2-ubuntu-1604-3000-3-py2
@@ -74,8 +75,6 @@ jobs:
     - env: INSTANCE=v201902-py3-ubuntu-1604-2019-2-py3
     # - env: INSTANCE=v201902-py3-centos-8-2019-2-py3
     - env: INSTANCE=v201902-py3-centos-7-2019-2-py3
-    # - env: INSTANCE=v201902-py3-fedora-31-2019-2-py3
-    - env: INSTANCE=v201902-py3-opensuse-leap-151-2019-2-py3
     # - env: INSTANCE=v201902-py3-amazonlinux-2-2019-2-py3
     - env: INSTANCE=v201902-py2-centos-6-2019-2-py2
     # - env: INSTANCE=v201902-py2-amazonlinux-1-2019-2-py2

kitchen.yml

@@ -30,6 +30,14 @@ platforms:
   - name: fedora-31-3000-3-py3
     driver:
       image: netmanagers/salt-3000.3-py3:fedora-31
+  - name: opensuse-leap-152-3000-3-py3
+    driver:
+      image: netmanagers/salt-3000.3-py3:opensuse-leap-15.2
+      run_command: /usr/lib/systemd/systemd
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
   - name: opensuse-leap-151-3000-3-py3
     driver:
       image: netmanagers/salt-3000.3-py3:opensuse-leap-15.1
@@ -67,17 +75,6 @@ platforms:
   - name: centos-7-2019-2-py3
     driver:
       image: netmanagers/salt-2019.2-py3:centos-7
-  - name: fedora-31-2019-2-py3
-    driver:
-      image: netmanagers/salt-2019.2-py3:fedora-31
-  - name: opensuse-leap-151-2019-2-py3
-    driver:
-      image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
   - name: amazonlinux-2-2019-2-py3
     driver:
       image: netmanagers/salt-2019.2-py3:amazonlinux-2
@@ -117,6 +114,7 @@ suites:
       - centos-8-3000-3-py3
       - centos-7-3000-3-py3
       - fedora-31-3000-3-py3
+      - opensuse-leap-152-3000-3-py3
       - opensuse-leap-151-3000-3-py3
       - amazonlinux-2-3000-3-py3
     provisioner:
@@ -169,8 +167,6 @@ suites:
       - ubuntu-1604-2019-2-py3
       - centos-8-2019-2-py3
       - centos-7-2019-2-py3
-      - fedora-31-2019-2-py3
-      - opensuse-leap-151-2019-2-py3
       - amazonlinux-2-2019-2-py3
     provisioner:
       state_top:

salt/osfamilymap.yaml

@@ -4,7 +4,7 @@
 
 {%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
 
-{%- set osrelease = salt['grains.get']('osrelease') %}
+{%- set osrelease = salt['grains.get']('osrelease', '') %}
 {%- set salt_release = salt['pillar.get']('salt:release', 'latest') %}
 {%- if salt_release.split('.')|length >= 3 %}
 {%-   set salt_release = 'archive/' ~ salt_release %}
@@ -12,6 +12,7 @@
 {%- set osfamily_lower =  salt['grains.get']('os_family')|lower %}
 {%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
 {%- set oscodename = salt['grains.get']('oscodename') %}
+{%- set suse_testing_repo = ':/products:/next:/testing' if [osfamily_lower, osrelease] == ['suse', '15.2'] else '' %}
 
 #from template-formula
 {%- if grains.os == 'MacOS' %}
@@ -54,8 +55,8 @@ RedHat:
 
 Suse:
   pkgrepo_humanname: 'Salt releases for SLE-based SUSE products (openSUSE_Leap_{{ osrelease }})'
-  pkgrepo: 'http://repo.saltstack.com/opensuse/openSUSE_Leap_{{ osrelease }}/'
+  pkgrepo: 'https://download.opensuse.org/repositories/systemsmanagement:/saltstack{{ suse_testing_repo }}/openSUSE_Leap_{{ osrelease }}/'
-  key_url: 'http://repo.saltstack.com/opensuse/openSUSE_Leap_{{ osrelease }}/repodata/repomd.xml.key'
+  key_url: 'https://download.opensuse.org/repositories/systemsmanagement:/saltstack{{ suse_testing_repo }}/openSUSE_Leap_{{ osrelease }}/repodata/repomd.xml.key'
   pygit2: python-pygit2
   pyinotify: python-pyinotify
   gitfs:

test/integration/v201902-py3/controls/pkgs_spec.rb

@@ -16,12 +16,6 @@ version =
     when 'amazon-2'
       '2019.2.5-1.amzn2'
     end
-  when 'fedora'
-    # Issue in the upstream repo, should be `3000.3`
-    '3000.2-1.fc31'
-  when 'suse'
-    # Issue in the upstream repo, should be `2019.2.5`
-    '2019.2.0-lp151.37.1'
   end
 
 control 'salt packages' do

test/integration/v3000-py3/controls/pkgs_spec.rb

@@ -17,11 +17,15 @@ version =
       '3000.3-1.amzn2'
     end
   when 'fedora'
-    # Issue in the upstream repo, should be `3000.3`
+    '3000.3-1.fc31'
-    '3000.2-1.fc31'
   when 'suse'
     # Issue in the upstream repo, should be `3000.3`
-    '2019.2.0-lp151.37.1'
+    case platform[:release]
+    when /^15.2/
+      '3000.2-lp152.7.1'
+    when /^15.1/
+      '3000.2-lp151.2.1'
+    end
   end
 
 control 'salt packages' do