fix(osfamilymap): update openSUSE pkgrepo URLs

saltstack-formulas · Jan 29, 2021 · 48f8da0 · 48f8da0
1 parent a9413e8
commit 48f8da0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml
@@ -12,7 +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 '' %}
+{%- set opensuse_repo_suffix = 'Leap_' ~ osrelease if salt['grains.get']('osfinger', '') == 'Leap-15' else 'Tumbleweed' %}
 
 #from template-formula
 {%- if grains.os_family == 'MacOS' %}
@@ -57,9 +57,9 @@ RedHat:
     gitfs_provider: pygit2
 
 Suse:
-  pkgrepo_humanname: 'Salt releases for SLE-based SUSE products (openSUSE_Leap_{{ osrelease }})'
-  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'
+  pkgrepo_humanname: 'Salt releases for SLE-based SUSE products (openSUSE_{{ opensuse_repo_suffix }})'
+  pkgrepo: 'https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_{{ opensuse_repo_suffix }}/'
+  key_url: 'https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_{{ opensuse_repo_suffix }}/repodata/repomd.xml.key'
   pygit2: python-pygit2
   pyinotify: python-pyinotify
   gitfs:

diff --git a/test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack:/products:/next:/testing/openSUSE_Leap_15.2/repodata/repomd.xml.key
+    key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key
     master:
       file_roots:
         base:
@@ -78,7 +78,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack:/products:/next:/testing/openSUSE_Leap_15.2/
+    pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/
     pkgrepo_humanname: Salt releases for SLE-based SUSE products (openSUSE_Leap_15.2)
     py_ver: py3
     pygit2: python-pygit2

diff --git a/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack:/products:/next:/testing/openSUSE_Leap_15.2/repodata/repomd.xml.key
+    key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key
     master:
       file_roots:
         base:
@@ -78,7 +78,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack:/products:/next:/testing/openSUSE_Leap_15.2/
+    pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/
     pkgrepo_humanname: Salt releases for SLE-based SUSE products (openSUSE_Leap_15.2)
     py_ver: py3
     pygit2: python-pygit2

diff --git a/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml b/test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml
@@ -42,7 +42,7 @@ values:
           version: 0.23.0
         version: 0.23.0
     install_packages: true
-    key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack:/products:/next:/testing/openSUSE_Leap_15.2/repodata/repomd.xml.key
+    key_url: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/repodata/repomd.xml.key
     master:
       file_roots:
         base:
@@ -78,7 +78,7 @@ values:
       state: running
     parallel: true
     pin_version: false
-    pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack:/products:/next:/testing/openSUSE_Leap_15.2/
+    pkgrepo: https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_Leap_15.2/
     pkgrepo_humanname: Salt releases for SLE-based SUSE products (openSUSE_Leap_15.2)
     py_ver: py3
     pygit2: python-pygit2