From 5d9a92bf1d567cf25916239c2b11828fe625fd17 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 26 May 2020 02:03:59 +0100
Subject: [PATCH] fix(opensuse): use appropriate upstream repo

---
 salt/osfamilymap.yaml                              | 7 ++++---
 test/integration/v201902-py3/controls/pkgs_spec.rb | 5 +----
 test/integration/v3000-py3/controls/pkgs_spec.rb   | 7 ++++++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml
index f2eecd9..8fcba19 100644
--- a/salt/osfamilymap.yaml
+++ b/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 }}/'
-  key_url: 'http://repo.saltstack.com/opensuse/openSUSE_Leap_{{ osrelease }}/repodata/repomd.xml.key'
+  pkgrepo: 'https://download.opensuse.org/repositories/systemsmanagement:/saltstack{{ suse_testing_repo }}/openSUSE_Leap_{{ osrelease }}/'
+  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:
diff --git a/test/integration/v201902-py3/controls/pkgs_spec.rb b/test/integration/v201902-py3/controls/pkgs_spec.rb
index f2ae934..2039d69 100644
--- a/test/integration/v201902-py3/controls/pkgs_spec.rb
+++ b/test/integration/v201902-py3/controls/pkgs_spec.rb
@@ -18,10 +18,7 @@ version =
     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'
+    '3000.3-1.fc31'
   end
 
 control 'salt packages' do
diff --git a/test/integration/v3000-py3/controls/pkgs_spec.rb b/test/integration/v3000-py3/controls/pkgs_spec.rb
index 55a7c31..2b644fe 100644
--- a/test/integration/v3000-py3/controls/pkgs_spec.rb
+++ b/test/integration/v3000-py3/controls/pkgs_spec.rb
@@ -21,7 +21,12 @@ version =
     '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