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

 
 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
       '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:
 

salt/defaults.yaml

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

salt/osfamilymap.yaml

 
 {%- 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 %}
 {%- 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' %}
 
 
 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:
 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:

salt/osfingermap.yaml

 
 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'

salt/osmap.yaml

 
 {%- 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 %}
 {%- 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
 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:
 
 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

test/integration/default/files/_mapdata/almalinux-8.yaml

           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
       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

test/integration/default/files/_mapdata/amazonlinux-2.yaml

           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
       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

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

     pyinotify: python2-pyinotify
     python_dulwich: python-dulwich
     python_git: python2-gitpython
-    release: '3004'
+    release: '3006'
     restart_via_at: false
     retry_options:
       attempts: 5

test/integration/default/files/_mapdata/centos-7.yaml

           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
       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

test/integration/default/files/_mapdata/centos-8.yaml

           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
       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

test/integration/default/files/_mapdata/debian-10.yaml

     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

test/integration/default/files/_mapdata/debian-11.yaml

     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

test/integration/default/files/_mapdata/debian-9.yaml

     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

test/integration/default/files/_mapdata/fedora-33.yaml

           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
       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

test/integration/default/files/_mapdata/fedora-34.yaml

           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
       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

test/integration/default/files/_mapdata/fedora-35.yaml

           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
       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

test/integration/default/files/_mapdata/fedora-36.yaml

           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
       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

test/integration/default/files/_mapdata/freebsd-12.yaml

     pygit2: py39-pygit2
     python_dulwich: py39-dulwich
     python_git: py39-gitpython
-    release: '3004'
+    release: '3006'
     restart_via_at: false
     retry_options:
       attempts: 5

test/integration/default/files/_mapdata/freebsd-13.yaml

     pygit2: py39-pygit2
     python_dulwich: py39-dulwich
     python_git: py39-gitpython
-    release: '3004'
+    release: '3006'
     restart_via_at: false
     retry_options:
       attempts: 5

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

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

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

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

test/integration/default/files/_mapdata/openbsd-7.yaml

     py_ver: py3
     python_dulwich: py3-dulwich
     python_git: py3-GitPython
-    release: '3003'
+    release: '3006'
     restart_via_at: false
     retry_options:
       attempts: 5

test/integration/default/files/_mapdata/opensuse-15.yaml

     pyinotify: python-pyinotify
     python_dulwich: python-dulwich
     python_git: python-git
-    release: '3004'
+    release: '3006'
     restart_via_at: false
     retry_options:
       attempts: 5

test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml

     pyinotify: python-pyinotify
     python_dulwich: python-dulwich
     python_git: python-git
-    release: '3004'
+    release: '3006'
     restart_via_at: false
     retry_options:
       attempts: 5

test/integration/default/files/_mapdata/oraclelinux-7.yaml

           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
       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

test/integration/default/files/_mapdata/oraclelinux-8.yaml

           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
       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

test/integration/default/files/_mapdata/rockylinux-8.yaml

           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
       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

test/integration/default/files/_mapdata/ubuntu-18.yaml

           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:
     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

test/integration/default/files/_mapdata/ubuntu-20.yaml

           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:
     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

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

     py_ver: py3
     python_dulwich: python-dulwich
     python_git: python-git
-    release: '3003'
+    release: '3006'
     restart_via_at: false
     retry_options:
       attempts: 5

test/salt/pillar/top.sls

   '*':
     - 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
 ...

test/salt/pillar/v3003-py3.sls

-# -*- coding: utf-8 -*-
-# vim: ft=yaml
----
-salt:
-  release: '3003'

test/salt/pillar/v3004-py3.sls

-# -*- coding: utf-8 -*-
-# vim: ft=yaml
----
-salt:
-  release: '3004'

test/salt/pillar/v3002-py3.sls → test/salt/pillar/v3006-py3.sls

 # vim: ft=yaml
 ---
 salt:
-  release: '3002'
+  release: '3006'