Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

fix(osfamilymap): update openSUSE `pkgrepo` URLs

This commit is contained in:
Imran Iqbal 2021-01-29 09:24:08 +00:00
parent a9413e8c29
commit 48f8da0357
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/osfamilymap.yaml
View File

@ -12,7 +12,7 @@
{%- set osfamily_lower = salt['grains.get']('os_family')|lower %} {%- set osfamily_lower = salt['grains.get']('os_family')|lower %}
{%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} {%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
{%- set oscodename = salt['grains.get']('oscodename') %} {%- 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 #from template-formula
{%- if grains.os_family == 'MacOS' %} {%- if grains.os_family == 'MacOS' %}
@ -57,9 +57,9 @@ RedHat:
gitfs_provider: pygit2 gitfs_provider: pygit2
Suse: Suse:
pkgrepo_humanname: 'Salt releases for SLE-based SUSE products (openSUSE_Leap_{{ osrelease }})' pkgrepo_humanname: 'Salt releases for SLE-based SUSE products (openSUSE_{{ opensuse_repo_suffix }})'
pkgrepo: 'https://download.opensuse.org/repositories/systemsmanagement:/saltstack{{ suse_testing_repo }}/openSUSE_Leap_{{ osrelease }}/' pkgrepo: 'https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_{{ opensuse_repo_suffix }}/'
key_url: 'https://download.opensuse.org/repositories/systemsmanagement:/saltstack{{ suse_testing_repo }}/openSUSE_Leap_{{ osrelease }}/repodata/repomd.xml.key' key_url: 'https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_{{ opensuse_repo_suffix }}/repodata/repomd.xml.key'
pygit2: python-pygit2 pygit2: python-pygit2
pyinotify: python-pyinotify pyinotify: python-pyinotify
gitfs: gitfs:

4
test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml
View File

@ -42,7 +42,7 @@ values:
version: 0.23.0 version: 0.23.0
version: 0.23.0 version: 0.23.0
install_packages: true 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: master:
file_roots: file_roots:
base: base:
@ -78,7 +78,7 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false 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) pkgrepo_humanname: Salt releases for SLE-based SUSE products (openSUSE_Leap_15.2)
py_ver: py3 py_ver: py3
pygit2: python-pygit2 pygit2: python-pygit2

4
test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml
View File

@ -42,7 +42,7 @@ values:
version: 0.23.0 version: 0.23.0
version: 0.23.0 version: 0.23.0
install_packages: true 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: master:
file_roots: file_roots:
base: base:
@ -78,7 +78,7 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false 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) pkgrepo_humanname: Salt releases for SLE-based SUSE products (openSUSE_Leap_15.2)
py_ver: py3 py_ver: py3
pygit2: python-pygit2 pygit2: python-pygit2

4
test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml
View File

@ -42,7 +42,7 @@ values:
version: 0.23.0 version: 0.23.0
version: 0.23.0 version: 0.23.0
install_packages: true 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: master:
file_roots: file_roots:
base: base:
@ -78,7 +78,7 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false 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) pkgrepo_humanname: Salt releases for SLE-based SUSE products (openSUSE_Leap_15.2)
py_ver: py3 py_ver: py3
pygit2: python-pygit2 pygit2: python-pygit2