Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-12-18 06:12:55 +01:00
Code Issues Activity

fix(repos): fix namings after salt binaries and keys move

Browse Source 
BREAKING CHANGES: This commit changes upstream repository naming conventions
to get latest binaries and keys. If you depends on versions of salt from older,
please stick with version 1.x.x of this formula
This commit is contained in:
Sean Molenaar 2023-05-19 09:11:15 +02:00 committed by sticky-note
parent 570c44b166
commit f1f04e6050
34 changed files with 99 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/README.rst
View File

@ -16,6 +16,12 @@ salt-formula
Yes, Salt can Salt itself! Yes, Salt can Salt itself!
## Note: As for salt `3006` and new `onedir` distribution method,
upstream repositories of saltstack have changed naming conventions
to get latest binaries and keys.
If you depends on versions of salt from older repositories,
please stick with version 1.x.x of this formula.
.. contents:: **Table of Contents** .. contents:: **Table of Contents**
General notes General notes

2
salt/defaults.yaml
View File

@ -4,7 +4,7 @@
salt: salt:
version: '' version: ''
pin_version: false pin_version: false
py_ver: '' ## py2 is default py_ver: 'py3' ## py3 is default
rootuser: root rootuser: root
rootgroup: root rootgroup: root
install_packages: true install_packages: true

16
salt/osfamilymap.yaml
View File

@ -4,6 +4,10 @@
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %} {%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
{%- set osarch = salt['grains.get']('osarch', '') %}
{%- set repoarch = 'amd64' if osarch in ['x86_64', 'amd64']
else 'arm64' if osarch in ['aarch64', 'arm64']
else '' %}
{%- set osrelease = salt['grains.get']('osrelease', '') %} {%- set osrelease = salt['grains.get']('osrelease', '') %}
{%- set salt_release = salt['pillar.get']('salt:release', 'latest') %} {%- set salt_release = salt['pillar.get']('salt:release', 'latest') %}
{%- if salt_release.split('.')|length >= 3 %} {%- if salt_release.split('.')|length >= 3 %}
@ -13,7 +17,7 @@
{%- 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 opensuse_repo_suffix = 'Leap_' ~ osrelease if salt['grains.get']('osfinger', '') == 'Leap-15' else 'Tumbleweed' %} {%- set opensuse_repo_suffix = 'Leap_' ~ osrelease if salt['grains.get']('osfinger', '') == 'Leap-15' else 'Tumbleweed' %}
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %} {%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io/salt') %}
#from template-formula #from template-formula
{%- if grains.os_family == 'MacOS' %} {%- if grains.os_family == 'MacOS' %}
@ -25,9 +29,9 @@
Debian: Debian:
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] {{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main' pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch={{ repoarch }}] {{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/{{ repoarch }}/{{ salt_release }} {{ oscodename }} main'
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg' pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg'
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472
libgit2: libgit2-22 libgit2: libgit2-22
pyinotify: python-pyinotify pyinotify: python-pyinotify
gitfs: gitfs:
@ -43,8 +47,8 @@ Debian:
RedHat: RedHat:
pkgrepo_name: saltstack pkgrepo_name: saltstack
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/$releasever/$basearch/{{ salt_release }}' pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/redhat/$releasever/$basearch/{{ salt_release }}'
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/$releasever/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' key_url: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/redhat/$releasever/$basearch/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg'
pygit2: python-pygit2 pygit2: python-pygit2
python_git: GitPython python_git: GitPython
gitfs: gitfs:

4
salt/osfingermap.yaml
View File

@ -14,5 +14,5 @@
Oracle Linux Server-7: Oracle Linux Server-7:
pkgrepo_humanname: SaltStack repo for RHEL/CentOS {{ osmajorrelease }} pkgrepo_humanname: SaltStack repo for RHEL/CentOS {{ osmajorrelease }}
pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}' pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}'
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' key_url: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg'

20
salt/osmap.yaml
View File

@ -4,6 +4,10 @@
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %} {%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
{%- set osarch = salt['grains.get']('osarch', '') %}
{%- set repoarch = 'amd64' if osarch in ['x86_64', 'amd64']
else 'arm64' if osarch in ['aarch64', 'arm64']
else '' %}
{%- set osrelease = salt['grains.get']('osrelease', '') %} {%- set osrelease = salt['grains.get']('osrelease', '') %}
{%- set salt_release = salt['pillar.get']('salt:release', 'latest') %} {%- set salt_release = salt['pillar.get']('salt:release', 'latest') %}
{%- if salt_release.split('.')|length >= 3 %} {%- if salt_release.split('.')|length >= 3 %}
@ -13,7 +17,7 @@
{%- 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 os_family_lower = salt['grains.get']('os_family')|lower %} {%- set os_family_lower = salt['grains.get']('os_family')|lower %}
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %} {%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io/salt') %}
Fedora: Fedora:
pygit2: python2-pygit2 pygit2: python2-pygit2
@ -21,14 +25,14 @@ Fedora:
Amazon: Amazon:
pkgrepo_name: saltstack-amzn-repo pkgrepo_name: saltstack-amzn-repo
pkgrepo_humanname: SaltStack repo for Amazon Linux 2 pkgrepo_humanname: SaltStack repo for Amazon Linux 2
pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/amazon/2/$basearch/{{ salt_release }}' pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/amazon/2/$basearch/{{ salt_release }}'
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' key_url: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/amazon/2/$basearch/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg'
Ubuntu: Ubuntu:
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }} {{ oscodename }} main' pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch={{ repoarch }}] {{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_lower }}/{{ osrelease }}/{{ repoarch }}/{{ salt_release }} {{ oscodename }} main'
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg' pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg'
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' key_url: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg'
pygit2: python-pygit2 pygit2: python-pygit2
gitfs: gitfs:
pygit2: pygit2:
@ -39,7 +43,7 @@ Ubuntu:
Raspbian: Raspbian:
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=armhf] {{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main' pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=armhf] {{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main'
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/salt-archive-keyring.gpg' pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg'
SmartOS: SmartOS:
salt_master: salt salt_master: salt

6
test/integration/default/files/_mapdata/almalinux-8.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://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006/SALT-PROJECT-GPG-PUBKEY-2023.pub
master: master:
ext_pillar: ext_pillar:
- cmd_yaml: cat /etc/salt/yaml - cmd_yaml: cat /etc/salt/yaml
@ -87,14 +87,14 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 pkgrepo: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
pkgrepo_name: saltstack pkgrepo_name: saltstack
py_ver: py3 py_ver: py3
pygit2: python-pygit2 pygit2: python-pygit2
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: GitPython python_git: GitPython
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

6
test/integration/default/files/_mapdata/amazonlinux-2.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://repo.saltproject.io/py3/amazon/2/$basearch/3004/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltproject.io/salt/py3/amazon/2/$basearch/3006/SALT-PROJECT-GPG-PUBKEY-2023.pub
master: master:
ext_pillar: ext_pillar:
- cmd_yaml: cat /etc/salt/yaml - cmd_yaml: cat /etc/salt/yaml
@ -87,14 +87,14 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: https://repo.saltproject.io/py3/amazon/2/$basearch/3004 pkgrepo: https://repo.saltproject.io/salt/py3/amazon/2/$basearch/3006
pkgrepo_humanname: SaltStack repo for Amazon Linux 2 pkgrepo_humanname: SaltStack repo for Amazon Linux 2
pkgrepo_name: saltstack-amzn-repo pkgrepo_name: saltstack-amzn-repo
py_ver: py3 py_ver: py3
pygit2: python-pygit2 pygit2: python-pygit2
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: GitPython python_git: GitPython
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

2
test/integration/default/files/_mapdata/arch-base-latest.yaml
View File

@ -93,7 +93,7 @@ values:
pyinotify: python2-pyinotify pyinotify: python2-pyinotify
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: python2-gitpython python_git: python2-gitpython
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

6
test/integration/default/files/_mapdata/centos-7.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://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006/SALT-PROJECT-GPG-PUBKEY-2023.pub
master: master:
ext_pillar: ext_pillar:
- cmd_yaml: cat /etc/salt/yaml - cmd_yaml: cat /etc/salt/yaml
@ -87,14 +87,14 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 pkgrepo: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
pkgrepo_name: saltstack pkgrepo_name: saltstack
py_ver: py3 py_ver: py3
pygit2: python-pygit2 pygit2: python-pygit2
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: GitPython python_git: GitPython
release: '3003' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

6
test/integration/default/files/_mapdata/centos-8.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://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006/SALT-PROJECT-GPG-PUBKEY-2023.pub
master: master:
ext_pillar: ext_pillar:
- cmd_yaml: cat /etc/salt/yaml - cmd_yaml: cat /etc/salt/yaml
@ -87,14 +87,14 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 pkgrepo: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
pkgrepo_name: saltstack pkgrepo_name: saltstack
py_ver: py3 py_ver: py3
pygit2: python-pygit2 pygit2: python-pygit2
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: GitPython python_git: GitPython
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

8
test/integration/default/files/_mapdata/debian-10.yaml
View File

@ -88,14 +88,14 @@ values:
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/debian/10/amd64/3003 buster main https://repo.saltproject.io/salt/py3/debian/10/amd64/3006 buster main
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/10/amd64/3003/salt-archive-keyring.gpg pkgrepo_keyring: https://repo.saltproject.io/salt/py3/debian/9/amd64/3006/SALT-PROJECT-GPG-PUBKEY-2023.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472
py_ver: py3 py_ver: py3
pyinotify: python-pyinotify pyinotify: python-pyinotify
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: python-git python_git: python-git
release: '3003' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

8
test/integration/default/files/_mapdata/debian-11.yaml
View File

@ -88,14 +88,14 @@ values:
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/debian/11/amd64/3004 bullseye main https://repo.saltproject.io/salt/py3/debian/11/amd64/3006 bullseye main
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/11/amd64/3004/salt-archive-keyring.gpg pkgrepo_keyring: https://repo.saltproject.io/salt/py3/debian/9/amd64/3006/SALT-PROJECT-GPG-PUBKEY-2023.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472
py_ver: py3 py_ver: py3
pyinotify: python-pyinotify pyinotify: python-pyinotify
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: python-git python_git: python-git
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

8
test/integration/default/files/_mapdata/debian-9.yaml
View File

@ -88,14 +88,14 @@ values:
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/debian/9/amd64/3003 stretch main https://repo.saltproject.io/salt/py3/debian/9/amd64/3006 stretch main
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3003/salt-archive-keyring.gpg pkgrepo_keyring: https://repo.saltproject.io/salt/py3/debian/9/amd64/3006/SALT-PROJECT-GPG-PUBKEY-2023.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472
py_ver: py3 py_ver: py3
pyinotify: python-pyinotify pyinotify: python-pyinotify
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: python-git python_git: python-git
release: '3003' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

6
test/integration/default/files/_mapdata/fedora-33.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://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006/SALT-PROJECT-GPG-PUBKEY-2023.pub
master: master:
ext_pillar: ext_pillar:
- cmd_yaml: cat /etc/salt/yaml - cmd_yaml: cat /etc/salt/yaml
@ -87,14 +87,14 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003 pkgrepo: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
pkgrepo_name: saltstack pkgrepo_name: saltstack
py_ver: py3 py_ver: py3
pygit2: python2-pygit2 pygit2: python2-pygit2
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: GitPython python_git: GitPython
release: '3003' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

6
test/integration/default/files/_mapdata/fedora-34.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://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006/SALT-PROJECT-GPG-PUBKEY-2023.pub
master: master:
ext_pillar: ext_pillar:
- cmd_yaml: cat /etc/salt/yaml - cmd_yaml: cat /etc/salt/yaml
@ -87,14 +87,14 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 pkgrepo: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
pkgrepo_name: saltstack pkgrepo_name: saltstack
py_ver: py3 py_ver: py3
pygit2: python2-pygit2 pygit2: python2-pygit2
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: GitPython python_git: GitPython
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

6
test/integration/default/files/_mapdata/fedora-35.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://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006/SALT-PROJECT-GPG-PUBKEY-2023.pub
master: master:
ext_pillar: ext_pillar:
- cmd_yaml: cat /etc/salt/yaml - cmd_yaml: cat /etc/salt/yaml
@ -87,14 +87,14 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 pkgrepo: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
pkgrepo_name: saltstack pkgrepo_name: saltstack
py_ver: py3 py_ver: py3
pygit2: python2-pygit2 pygit2: python2-pygit2
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: GitPython python_git: GitPython
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

6
test/integration/default/files/_mapdata/fedora-36.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://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006/SALT-PROJECT-GPG-PUBKEY-2023.pub
master: master:
ext_pillar: ext_pillar:
- cmd_yaml: cat /etc/salt/yaml - cmd_yaml: cat /etc/salt/yaml
@ -87,14 +87,14 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 pkgrepo: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
pkgrepo_name: saltstack pkgrepo_name: saltstack
py_ver: py3 py_ver: py3
pygit2: python2-pygit2 pygit2: python2-pygit2
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: GitPython python_git: GitPython
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

2
test/integration/default/files/_mapdata/freebsd-12.yaml
View File

@ -91,7 +91,7 @@ values:
pygit2: py39-pygit2 pygit2: py39-pygit2
python_dulwich: py39-dulwich python_dulwich: py39-dulwich
python_git: py39-gitpython python_git: py39-gitpython
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

2
test/integration/default/files/_mapdata/freebsd-13.yaml
View File

@ -91,7 +91,7 @@ values:
pygit2: py39-pygit2 pygit2: py39-pygit2
python_dulwich: py39-dulwich python_dulwich: py39-dulwich
python_git: py39-gitpython python_git: py39-gitpython
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

2
test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
View File

@ -91,7 +91,7 @@ values:
pyinotify: dev-python/pyinotify pyinotify: dev-python/pyinotify
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: python-git python_git: python-git
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

2
test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
View File

@ -91,7 +91,7 @@ values:
pyinotify: dev-python/pyinotify pyinotify: dev-python/pyinotify
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: python-git python_git: python-git
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

2
test/integration/default/files/_mapdata/openbsd-7.yaml
View File

@ -90,7 +90,7 @@ values:
py_ver: py3 py_ver: py3
python_dulwich: py3-dulwich python_dulwich: py3-dulwich
python_git: py3-GitPython python_git: py3-GitPython
release: '3003' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

2
test/integration/default/files/_mapdata/opensuse-15.yaml
View File

@ -94,7 +94,7 @@ values:
pyinotify: python-pyinotify pyinotify: python-pyinotify
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: python-git python_git: python-git
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

2
test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
View File

@ -94,7 +94,7 @@ values:
pyinotify: python-pyinotify pyinotify: python-pyinotify
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: python-git python_git: python-git
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

6
test/integration/default/files/_mapdata/oraclelinux-7.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://repo.saltproject.io/py3/redhat/7/$basearch/3003/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltproject.io/salt/py3/redhat/7/$basearch/3006/SALT-PROJECT-GPG-PUBKEY-2023.pub
master: master:
ext_pillar: ext_pillar:
- cmd_yaml: cat /etc/salt/yaml - cmd_yaml: cat /etc/salt/yaml
@ -87,14 +87,14 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: https://repo.saltproject.io/py3/redhat/7/$basearch/3003 pkgrepo: https://repo.saltproject.io/salt/py3/redhat/7/$basearch/3006
pkgrepo_humanname: SaltStack repo for RHEL/CentOS 7 pkgrepo_humanname: SaltStack repo for RHEL/CentOS 7
pkgrepo_name: saltstack pkgrepo_name: saltstack
py_ver: py3 py_ver: py3
pygit2: python-pygit2 pygit2: python-pygit2
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: GitPython python_git: GitPython
release: '3003' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

6
test/integration/default/files/_mapdata/oraclelinux-8.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://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006/SALT-PROJECT-GPG-PUBKEY-2023.pub
master: master:
ext_pillar: ext_pillar:
- cmd_yaml: cat /etc/salt/yaml - cmd_yaml: cat /etc/salt/yaml
@ -87,14 +87,14 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 pkgrepo: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
pkgrepo_name: saltstack pkgrepo_name: saltstack
py_ver: py3 py_ver: py3
pygit2: python-pygit2 pygit2: python-pygit2
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: GitPython python_git: GitPython
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

6
test/integration/default/files/_mapdata/rockylinux-8.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://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006/SALT-PROJECT-GPG-PUBKEY-2023.pub
master: master:
ext_pillar: ext_pillar:
- cmd_yaml: cat /etc/salt/yaml - cmd_yaml: cat /etc/salt/yaml
@ -87,14 +87,14 @@ values:
state: running state: running
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004 pkgrepo: https://repo.saltproject.io/salt/py3/redhat/$releasever/$basearch/3006
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
pkgrepo_name: saltstack pkgrepo_name: saltstack
py_ver: py3 py_ver: py3
pygit2: python-pygit2 pygit2: python-pygit2
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: GitPython python_git: GitPython
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

10
test/integration/default/files/_mapdata/ubuntu-18.yaml
View File

@ -42,7 +42,7 @@ values:
version: 0.23.0 version: 0.23.0
version: 0.22.1 version: 0.22.1
install_packages: true install_packages: true
key_url: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltproject.io/salt/py3/ubuntu/18.04/amd64/3006/SALT-PROJECT-GPG-PUBKEY-2023.pub
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar: ext_pillar:
@ -89,15 +89,15 @@ values:
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003 bionic main https://repo.saltproject.io/salt/py3/ubuntu/18.04/amd64/3006 bionic main
pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003/salt-archive-keyring.gpg pkgrepo_keyring: https://repo.saltproject.io/salt/py3/debian/9/amd64/3006/SALT-PROJECT-GPG-PUBKEY-2023.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472
py_ver: py3 py_ver: py3
pygit2: python-pygit2 pygit2: python-pygit2
pyinotify: python-pyinotify pyinotify: python-pyinotify
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: python-git python_git: python-git
release: '3003' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

10
test/integration/default/files/_mapdata/ubuntu-20.yaml
View File

@ -42,7 +42,7 @@ values:
version: 0.23.0 version: 0.23.0
version: 0.22.1 version: 0.22.1
install_packages: true install_packages: true
key_url: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3004/SALTSTACK-GPG-KEY.pub key_url: https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/3006/SALT-PROJECT-GPG-PUBKEY-2023.gpg
libgit2: libgit2-22 libgit2: libgit2-22
master: master:
ext_pillar: ext_pillar:
@ -89,15 +89,15 @@ values:
parallel: true parallel: true
pin_version: false pin_version: false
pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3004 focal main https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/3006 focal main
pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3004/salt-archive-keyring.gpg pkgrepo_keyring: https://repo.saltproject.io/salt/py3/debian/9/amd64/3006/SALT-PROJECT-GPG-PUBKEY-2023.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472
py_ver: py3 py_ver: py3
pygit2: python-pygit2 pygit2: python-pygit2
pyinotify: python-pyinotify pyinotify: python-pyinotify
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: python-git python_git: python-git
release: '3004' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

2
test/integration/default/files/_mapdata/windows-2016-server.yaml
View File

@ -90,7 +90,7 @@ values:
py_ver: py3 py_ver: py3
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: python-git python_git: python-git
release: '3003' release: '3006'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
attempts: 5 attempts: 5

4
test/salt/pillar/top.sls
View File

@ -5,7 +5,7 @@ base:
'*': '*':
- salt - salt
'G@saltversioninfo:0:3004 and G@pythonversion:0:3': 'G@saltversioninfo:0:3004 and G@pythonversion:0:3':
- v3004-py3 - v3006-py3
'G@saltversioninfo:0:3003 and G@pythonversion:0:3': 'G@saltversioninfo:0:3003 and G@pythonversion:0:3':
- v3003-py3 - v3006-py3
... ...

5
test/salt/pillar/v3003-py3.sls
View File

@ -1,5 +0,0 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
salt:
release: '3003'

5
test/salt/pillar/v3004-py3.sls
View File

@ -1,5 +0,0 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
salt:
release: '3004'

2
test/salt/pillar/v3002-py3.sls → test/salt/pillar/v3006-py3.sls
View File

@ -2,4 +2,4 @@
# vim: ft=yaml # vim: ft=yaml
--- ---
salt: salt:
release: '3002' release: '3006'