From f1f04e60501535e9ec3bd6261348d5e30bee5284 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Fri, 19 May 2023 09:11:15 +0200 Subject: [PATCH] fix(repos): fix namings after salt binaries and keys move 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 --- docs/README.rst | 8 +++++++- salt/defaults.yaml | 2 +- salt/osfamilymap.yaml | 16 +++++++++------ salt/osfingermap.yaml | 4 ++-- salt/osmap.yaml | 20 +++++++++++-------- .../default/files/_mapdata/almalinux-8.yaml | 6 +++--- .../default/files/_mapdata/amazonlinux-2.yaml | 6 +++--- .../files/_mapdata/arch-base-latest.yaml | 2 +- .../default/files/_mapdata/centos-7.yaml | 6 +++--- .../default/files/_mapdata/centos-8.yaml | 6 +++--- .../default/files/_mapdata/debian-10.yaml | 8 ++++---- .../default/files/_mapdata/debian-11.yaml | 8 ++++---- .../default/files/_mapdata/debian-9.yaml | 8 ++++---- .../default/files/_mapdata/fedora-33.yaml | 6 +++--- .../default/files/_mapdata/fedora-34.yaml | 6 +++--- .../default/files/_mapdata/fedora-35.yaml | 6 +++--- .../default/files/_mapdata/fedora-36.yaml | 6 +++--- .../default/files/_mapdata/freebsd-12.yaml | 2 +- .../default/files/_mapdata/freebsd-13.yaml | 2 +- .../default/files/_mapdata/gentoo-2-sysd.yaml | 2 +- .../default/files/_mapdata/gentoo-2-sysv.yaml | 2 +- .../default/files/_mapdata/openbsd-7.yaml | 2 +- .../default/files/_mapdata/opensuse-15.yaml | 2 +- .../files/_mapdata/opensuse-tumbleweed.yaml | 2 +- .../default/files/_mapdata/oraclelinux-7.yaml | 6 +++--- .../default/files/_mapdata/oraclelinux-8.yaml | 6 +++--- .../default/files/_mapdata/rockylinux-8.yaml | 6 +++--- .../default/files/_mapdata/ubuntu-18.yaml | 10 +++++----- .../default/files/_mapdata/ubuntu-20.yaml | 10 +++++----- .../files/_mapdata/windows-2016-server.yaml | 2 +- test/salt/pillar/top.sls | 4 ++-- test/salt/pillar/v3003-py3.sls | 5 ----- test/salt/pillar/v3004-py3.sls | 5 ----- .../pillar/{v3002-py3.sls => v3006-py3.sls} | 2 +- 34 files changed, 99 insertions(+), 95 deletions(-) delete mode 100644 test/salt/pillar/v3003-py3.sls delete mode 100644 test/salt/pillar/v3004-py3.sls rename test/salt/pillar/{v3002-py3.sls => v3006-py3.sls} (73%) diff --git a/docs/README.rst b/docs/README.rst index 7e86882..abfe13e 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -16,6 +16,12 @@ salt-formula 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** General notes @@ -134,7 +140,7 @@ Git repositories under ``/srv/formulas`` and makes them available in the relevan 'saltmain': - salt.formulas - salt.master - + Pillar data can be used to customize all paths, URLs, etc. Here's a minimal pillar sample installing two formulas in the base environment: diff --git a/salt/defaults.yaml b/salt/defaults.yaml index 2b84eec..dd02856 100644 --- a/salt/defaults.yaml +++ b/salt/defaults.yaml @@ -4,7 +4,7 @@ salt: version: '' pin_version: false - py_ver: '' ## py2 is default + py_ver: 'py3' ## py3 is default rootuser: root rootgroup: root install_packages: true diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml index e2e48a6..5795162 100644 --- a/salt/osfamilymap.yaml +++ b/salt/osfamilymap.yaml @@ -4,6 +4,10 @@ {%- 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 salt_release = salt['pillar.get']('salt:release', 'latest') %} {%- if salt_release.split('.')|length >= 3 %} @@ -13,7 +17,7 @@ {%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} {%- set oscodename = salt['grains.get']('oscodename') %} {%- 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 {%- if grains.os_family == 'MacOS' %} @@ -25,9 +29,9 @@ 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_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg' - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 + 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-PROJECT-GPG-PUBKEY-2023.gpg' + pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472 libgit2: libgit2-22 pyinotify: python-pyinotify gitfs: @@ -43,8 +47,8 @@ Debian: RedHat: pkgrepo_name: saltstack pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever - pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/$releasever/$basearch/{{ salt_release }}' - key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/$releasever/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' + pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/redhat/$releasever/$basearch/{{ salt_release }}' + key_url: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/redhat/$releasever/$basearch/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg' pygit2: python-pygit2 python_git: GitPython gitfs: diff --git a/salt/osfingermap.yaml b/salt/osfingermap.yaml index d92030d..220e353 100644 --- a/salt/osfingermap.yaml +++ b/salt/osfingermap.yaml @@ -14,5 +14,5 @@ Oracle Linux Server-7: pkgrepo_humanname: SaltStack repo for RHEL/CentOS {{ osmajorrelease }} - pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}' - key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' + pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}' + key_url: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg' diff --git a/salt/osmap.yaml b/salt/osmap.yaml index c553728..5f1d183 100644 --- a/salt/osmap.yaml +++ b/salt/osmap.yaml @@ -4,6 +4,10 @@ {%- 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 salt_release = salt['pillar.get']('salt:release', 'latest') %} {%- if salt_release.split('.')|length >= 3 %} @@ -13,7 +17,7 @@ {%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} {%- set oscodename = salt['grains.get']('oscodename') %} {%- 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: pygit2: python2-pygit2 @@ -21,14 +25,14 @@ Fedora: Amazon: pkgrepo_name: saltstack-amzn-repo pkgrepo_humanname: SaltStack repo for Amazon Linux 2 - pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/amazon/2/$basearch/{{ salt_release }}' - key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' + pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/amazon/2/$basearch/{{ salt_release }}' + key_url: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/amazon/2/$basearch/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg' 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_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg' - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 - key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' + 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 'py3' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg' + pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472 + key_url: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALT-PROJECT-GPG-PUBKEY-2023.gpg' pygit2: python-pygit2 gitfs: pygit2: @@ -39,7 +43,7 @@ Ubuntu: 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_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: salt_master: salt diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml index b24538b..e7096f0 100644 --- a/test/integration/default/files/_mapdata/almalinux-8.yaml +++ b/test/integration/default/files/_mapdata/almalinux-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 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: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -87,14 +87,14 @@ values: state: running parallel: true 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_name: saltstack py_ver: py3 pygit2: python-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml index 175f200..c91eeda 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 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: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -87,14 +87,14 @@ values: state: running parallel: true 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_name: saltstack-amzn-repo py_ver: py3 pygit2: python-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml index 798f5ff..61fabdd 100644 --- a/test/integration/default/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml @@ -93,7 +93,7 @@ values: pyinotify: python2-pyinotify python_dulwich: python-dulwich python_git: python2-gitpython - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index 72ccc36..592f76b 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 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: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -87,14 +87,14 @@ values: state: running parallel: true 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_name: saltstack py_ver: py3 pygit2: python-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3003' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index 60fc46f..55cef04 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 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: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -87,14 +87,14 @@ values: state: running parallel: true 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_name: saltstack py_ver: py3 pygit2: python-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index e3d07ce..d1a2aa9 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -88,14 +88,14 @@ values: parallel: true pin_version: false pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/debian/10/amd64/3003 buster main - pkgrepo_keyring: https://repo.saltproject.io/py3/debian/10/amd64/3003/salt-archive-keyring.gpg - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 + https://repo.saltproject.io/salt/py3/debian/10/amd64/3006 buster main + pkgrepo_keyring: https://repo.saltproject.io/salt/py3/debian/9/amd64/3006/SALT-PROJECT-GPG-PUBKEY-2023.gpg + pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3003' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml index efce8f0..0bcbb83 100644 --- a/test/integration/default/files/_mapdata/debian-11.yaml +++ b/test/integration/default/files/_mapdata/debian-11.yaml @@ -88,14 +88,14 @@ values: parallel: true pin_version: false pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/debian/11/amd64/3004 bullseye main - pkgrepo_keyring: https://repo.saltproject.io/py3/debian/11/amd64/3004/salt-archive-keyring.gpg - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 + https://repo.saltproject.io/salt/py3/debian/11/amd64/3006 bullseye main + pkgrepo_keyring: https://repo.saltproject.io/salt/py3/debian/9/amd64/3006/SALT-PROJECT-GPG-PUBKEY-2023.gpg + pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 9ed1616..ddbeafc 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -88,14 +88,14 @@ values: parallel: true pin_version: false pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] - https://repo.saltproject.io/py3/debian/9/amd64/3003 stretch main - pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3003/salt-archive-keyring.gpg - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 + https://repo.saltproject.io/salt/py3/debian/9/amd64/3006 stretch main + pkgrepo_keyring: https://repo.saltproject.io/salt/py3/debian/9/amd64/3006/SALT-PROJECT-GPG-PUBKEY-2023.gpg + pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3003' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml index 4187c7e..6b58852 100644 --- a/test/integration/default/files/_mapdata/fedora-33.yaml +++ b/test/integration/default/files/_mapdata/fedora-33.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 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: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -87,14 +87,14 @@ values: state: running parallel: true 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_name: saltstack py_ver: py3 pygit2: python2-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3003' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml index bf86114..78f3bd9 100644 --- a/test/integration/default/files/_mapdata/fedora-34.yaml +++ b/test/integration/default/files/_mapdata/fedora-34.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 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: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -87,14 +87,14 @@ values: state: running parallel: true 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_name: saltstack py_ver: py3 pygit2: python2-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/fedora-35.yaml b/test/integration/default/files/_mapdata/fedora-35.yaml index 13c0f81..56836bf 100644 --- a/test/integration/default/files/_mapdata/fedora-35.yaml +++ b/test/integration/default/files/_mapdata/fedora-35.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 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: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -87,14 +87,14 @@ values: state: running parallel: true 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_name: saltstack py_ver: py3 pygit2: python2-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/fedora-36.yaml b/test/integration/default/files/_mapdata/fedora-36.yaml index 77b0ee6..f06f249 100644 --- a/test/integration/default/files/_mapdata/fedora-36.yaml +++ b/test/integration/default/files/_mapdata/fedora-36.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 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: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -87,14 +87,14 @@ values: state: running parallel: true 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_name: saltstack py_ver: py3 pygit2: python2-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/freebsd-12.yaml b/test/integration/default/files/_mapdata/freebsd-12.yaml index c6aa88a..56509ad 100644 --- a/test/integration/default/files/_mapdata/freebsd-12.yaml +++ b/test/integration/default/files/_mapdata/freebsd-12.yaml @@ -91,7 +91,7 @@ values: pygit2: py39-pygit2 python_dulwich: py39-dulwich python_git: py39-gitpython - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/freebsd-13.yaml b/test/integration/default/files/_mapdata/freebsd-13.yaml index ec8d795..000ac96 100644 --- a/test/integration/default/files/_mapdata/freebsd-13.yaml +++ b/test/integration/default/files/_mapdata/freebsd-13.yaml @@ -91,7 +91,7 @@ values: pygit2: py39-pygit2 python_dulwich: py39-dulwich python_git: py39-gitpython - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 008272c..bedf50e 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml @@ -91,7 +91,7 @@ values: pyinotify: dev-python/pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index 008272c..bedf50e 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml @@ -91,7 +91,7 @@ values: pyinotify: dev-python/pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/openbsd-7.yaml b/test/integration/default/files/_mapdata/openbsd-7.yaml index 4d71f3b..a7775e1 100644 --- a/test/integration/default/files/_mapdata/openbsd-7.yaml +++ b/test/integration/default/files/_mapdata/openbsd-7.yaml @@ -90,7 +90,7 @@ values: py_ver: py3 python_dulwich: py3-dulwich python_git: py3-GitPython - release: '3003' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index e9a2af7..2263312 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -94,7 +94,7 @@ values: pyinotify: python-pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index e248935..3707446 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -94,7 +94,7 @@ values: pyinotify: python-pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml index 6ae2694..2986eee 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 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: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -87,14 +87,14 @@ values: state: running parallel: true 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_name: saltstack py_ver: py3 pygit2: python-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3003' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml index e017bea..1ff7770 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 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: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -87,14 +87,14 @@ values: state: running parallel: true 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_name: saltstack py_ver: py3 pygit2: python-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml index 84cdc26..b67a1b4 100644 --- a/test/integration/default/files/_mapdata/rockylinux-8.yaml +++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.23.0 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: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -87,14 +87,14 @@ values: state: running parallel: true 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_name: saltstack py_ver: py3 pygit2: python-pygit2 python_dulwich: python-dulwich python_git: GitPython - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 1bd6744..a54c2c8 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 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 master: ext_pillar: @@ -89,15 +89,15 @@ values: parallel: true pin_version: false 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 - pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003/salt-archive-keyring.gpg - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 + https://repo.saltproject.io/salt/py3/ubuntu/18.04/amd64/3006 bionic main + pkgrepo_keyring: https://repo.saltproject.io/salt/py3/debian/9/amd64/3006/SALT-PROJECT-GPG-PUBKEY-2023.gpg + pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472 py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3003' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index 87eb437..d8705d4 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -42,7 +42,7 @@ values: version: 0.23.0 version: 0.22.1 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 master: ext_pillar: @@ -89,15 +89,15 @@ values: parallel: true pin_version: false 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 - pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3004/salt-archive-keyring.gpg - pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 + https://repo.saltproject.io/salt/py3/ubuntu/20.04/amd64/3006 focal main + pkgrepo_keyring: https://repo.saltproject.io/salt/py3/debian/9/amd64/3006/SALT-PROJECT-GPG-PUBKEY-2023.gpg + pkgrepo_keyring_hash: sha256=c6f6cbcd96fdb130b1dde8dcfc05d46a3a3f322ff0514f98e2e6473896243472 py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify python_dulwich: python-dulwich python_git: python-git - release: '3004' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/integration/default/files/_mapdata/windows-2016-server.yaml b/test/integration/default/files/_mapdata/windows-2016-server.yaml index 87d32e6..4373470 100644 --- a/test/integration/default/files/_mapdata/windows-2016-server.yaml +++ b/test/integration/default/files/_mapdata/windows-2016-server.yaml @@ -90,7 +90,7 @@ values: py_ver: py3 python_dulwich: python-dulwich python_git: python-git - release: '3003' + release: '3006' restart_via_at: false retry_options: attempts: 5 diff --git a/test/salt/pillar/top.sls b/test/salt/pillar/top.sls index 06db9ab..d82d05d 100644 --- a/test/salt/pillar/top.sls +++ b/test/salt/pillar/top.sls @@ -5,7 +5,7 @@ base: '*': - salt 'G@saltversioninfo:0:3004 and G@pythonversion:0:3': - - v3004-py3 + - v3006-py3 'G@saltversioninfo:0:3003 and G@pythonversion:0:3': - - v3003-py3 + - v3006-py3 ... diff --git a/test/salt/pillar/v3003-py3.sls b/test/salt/pillar/v3003-py3.sls deleted file mode 100644 index bb7eff9..0000000 --- a/test/salt/pillar/v3003-py3.sls +++ /dev/null @@ -1,5 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=yaml ---- -salt: - release: '3003' diff --git a/test/salt/pillar/v3004-py3.sls b/test/salt/pillar/v3004-py3.sls deleted file mode 100644 index 2da9cba..0000000 --- a/test/salt/pillar/v3004-py3.sls +++ /dev/null @@ -1,5 +0,0 @@ -# -*- coding: utf-8 -*- -# vim: ft=yaml ---- -salt: - release: '3004' diff --git a/test/salt/pillar/v3002-py3.sls b/test/salt/pillar/v3006-py3.sls similarity index 73% rename from test/salt/pillar/v3002-py3.sls rename to test/salt/pillar/v3006-py3.sls index 55c9269..1f5308d 100644 --- a/test/salt/pillar/v3002-py3.sls +++ b/test/salt/pillar/v3006-py3.sls @@ -2,4 +2,4 @@ # vim: ft=yaml --- salt: - release: '3002' + release: '3006'