diff --git a/salt/osfamilymap.yaml b/salt/osfamilymap.yaml index acf02b154..b78b24be1 100644 --- a/salt/osfamilymap.yaml +++ b/salt/osfamilymap.yaml @@ -25,8 +25,10 @@ Debian: - pkgrepo: 'deb {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main' + pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main' key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' + pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg' + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 libgit2: libgit2-22 pyinotify: python-pyinotify gitfs: diff --git a/salt/osmap.yaml b/salt/osmap.yaml index 5abc7a567..b50bf01b2 100644 --- a/salt/osmap.yaml +++ b/salt/osmap.yaml @@ -25,7 +25,9 @@ Amazon: key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub' Ubuntu: - pkgrepo: 'deb {{ 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=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' pygit2: python-pygit2 gitfs: diff --git a/salt/pkgrepo/debian/absent.sls b/salt/pkgrepo/debian/absent.sls index 5cd26cc10..5a0448912 100644 --- a/salt/pkgrepo/debian/absent.sls +++ b/salt/pkgrepo/debian/absent.sls @@ -6,8 +6,8 @@ salt-pkgrepo-clean-saltstack-debian: pkgrepo.absent: - name: {{ salt_settings.pkgrepo }} file.absent: - - name: /etc/apt/sources.list.d/saltstack.list + - name: /etc/apt/sources.list.d/salt.list salt-pkgrepo-clean-saltstack-debian-apt-key: file.absent: - - name: /etc/apt/trusted.gpg.d/saltstack.gpg + - name: /usr/share/keyrings/salt-archive-keyring.gpg diff --git a/salt/pkgrepo/debian/clean.sls b/salt/pkgrepo/debian/clean.sls index 5cd26cc10..5a0448912 100644 --- a/salt/pkgrepo/debian/clean.sls +++ b/salt/pkgrepo/debian/clean.sls @@ -6,8 +6,8 @@ salt-pkgrepo-clean-saltstack-debian: pkgrepo.absent: - name: {{ salt_settings.pkgrepo }} file.absent: - - name: /etc/apt/sources.list.d/saltstack.list + - name: /etc/apt/sources.list.d/salt.list salt-pkgrepo-clean-saltstack-debian-apt-key: file.absent: - - name: /etc/apt/trusted.gpg.d/saltstack.gpg + - name: /usr/share/keyrings/salt-archive-keyring.gpg diff --git a/salt/pkgrepo/debian/install.sls b/salt/pkgrepo/debian/install.sls index 780bfd03e..0a936ff00 100644 --- a/salt/pkgrepo/debian/install.sls +++ b/salt/pkgrepo/debian/install.sls @@ -2,13 +2,27 @@ # vim: ft=sls {% from "salt/map.jinja" import salt_settings with context %} +salt-pkgrepo-install-saltstack-debian-keyring: + file.managed: + - name: /usr/share/keyrings/salt-archive-keyring.gpg + - source: {{ salt_settings.pkgrepo_keyring }} + - source_hash: {{ salt_settings.pkgrepo_keyring_hash }} + - require_in: + - pkgrepo: salt-pkgrepo-install-saltstack-debian + +salt-pkgrepo-install-saltstack-debian-remove-old-repo-file: + file.absent: + - name: /etc/apt/sources.list.d/saltstack.list + - require_in: + - pkgrepo: salt-pkgrepo-install-saltstack-debian + salt-pkgrepo-install-saltstack-debian: pkgrepo.managed: - humanname: SaltStack Debian Repo - name: {{ salt_settings.pkgrepo }} - - file: /etc/apt/sources.list.d/saltstack.list + - file: /etc/apt/sources.list.d/salt.list - key_url: {{ salt_settings.key_url }} - clean_file: True - # Order: 1 because we can't put a require_in on "pkg: salt-{master,minion}" + # Order: 3 because we can't put a require_in on "pkg: salt-{master,minion}" # because we don't know if they are used. - - order: 1 + - order: 3 diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml deleted file mode 100644 index 8d93fc602..000000000 --- a/test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Ubuntu-16.04 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: null - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: false - version: 0.23.0 - version: 0.22.1 - install_packages: true - key_url: https://repo.saltproject.io/apt/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub - libgit2: libgit2-22 - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: deb https://repo.saltproject.io/apt/ubuntu/16.04/amd64/3000 xenial main - py_ver: '' - pygit2: python-pygit2 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3000' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml b/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml index 30fc509f1..b16a82785 100644 --- a/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/apt/ubuntu/18.04/amd64/3000 bionic main + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/apt/ubuntu/18.04/amd64/3000 bionic main + pkgrepo_keyring: https://repo.saltproject.io/apt/ubuntu/18.04/amd64/3000/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: '' pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3000-py3/files/_mapdata/debian-10.yaml b/test/integration/v3000-py3/files/_mapdata/debian-10.yaml index 8961215c0..bcb9522f7 100644 --- a/test/integration/v3000-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3000-py3/files/_mapdata/debian-10.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3000 buster main + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/py3/debian/10/amd64/3000 buster main + pkgrepo_keyring: https://repo.saltproject.io/py3/debian/10/amd64/3000/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3000-py3/files/_mapdata/debian-9.yaml b/test/integration/v3000-py3/files/_mapdata/debian-9.yaml index 90fdcc53b..0e2502458 100644 --- a/test/integration/v3000-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3000-py3/files/_mapdata/debian-9.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3000 stretch main + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/py3/debian/9/amd64/3000 stretch main + pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3000/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml deleted file mode 100644 index b62d3736f..000000000 --- a/test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Ubuntu-16.04 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: null - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: false - version: 0.23.0 - version: 0.22.1 - install_packages: true - key_url: https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3000/SALTSTACK-GPG-KEY.pub - libgit2: libgit2-22 - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3000 xenial main - py_ver: py3 - pygit2: python-pygit2 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3000' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml index 0ae3787fa..02729ac0e 100644 --- a/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3000 bionic main + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3000 bionic main + pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3000/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3001-py3/files/_mapdata/debian-10.yaml b/test/integration/v3001-py3/files/_mapdata/debian-10.yaml index e90da6855..ce73428fb 100644 --- a/test/integration/v3001-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3001-py3/files/_mapdata/debian-10.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3001 buster main + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/py3/debian/10/amd64/3001 buster main + pkgrepo_keyring: https://repo.saltproject.io/py3/debian/10/amd64/3001/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3001-py3/files/_mapdata/debian-9.yaml b/test/integration/v3001-py3/files/_mapdata/debian-9.yaml index bd69e95fc..0b801d69c 100644 --- a/test/integration/v3001-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3001-py3/files/_mapdata/debian-9.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3001 stretch main + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/py3/debian/9/amd64/3001 stretch main + pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3001/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml deleted file mode 100644 index 4928d8cdc..000000000 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Ubuntu-16.04 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: null - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: false - version: 0.23.0 - version: 0.22.1 - install_packages: true - key_url: https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3001/SALTSTACK-GPG-KEY.pub - libgit2: libgit2-22 - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3001 xenial main - py_ver: py3 - pygit2: python-pygit2 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3001' - restart_via_at: false - retry_options: - attempts: 2 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml index 606dcc551..f782872c6 100644 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml @@ -48,8 +48,8 @@ values: ext_pillar: - cmd_yaml: cat /etc/salt/yaml - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg + - /path/to/stack1.cfg + - /path/to/stack2.cfg - reclass: inventory_base_uri: /etc/reclass file_roots: @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3001 bionic main + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3001 bionic main + pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3001/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml index 8c57f33ba..bda1f6986 100644 --- a/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3001 focal main + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3001 focal main + pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3001/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3002-py3/files/_mapdata/debian-10.yaml b/test/integration/v3002-py3/files/_mapdata/debian-10.yaml index ff253aae2..f28b3efa2 100644 --- a/test/integration/v3002-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3002-py3/files/_mapdata/debian-10.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3002 buster main + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/py3/debian/10/amd64/3002 buster main + pkgrepo_keyring: https://repo.saltproject.io/py3/debian/10/amd64/3002/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3002-py3/files/_mapdata/debian-9.yaml b/test/integration/v3002-py3/files/_mapdata/debian-9.yaml index 3491909ae..070428e51 100644 --- a/test/integration/v3002-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3002-py3/files/_mapdata/debian-9.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3002 stretch main + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/py3/debian/9/amd64/3002 stretch main + pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3002/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml deleted file mode 100644 index 3f811a88d..000000000 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml +++ /dev/null @@ -1,115 +0,0 @@ -# yamllint disable rule:indentation rule:line-length -# Ubuntu-16.04 ---- -values: - formulas_settings: - checkout_orig_branch: false - git_opts: - default: - basedir: /srv/formulas - baseurl: https://github.com/saltstack-formulas - options: - output_loglevel: quiet - rev: master - update: false - list: {} - salt_settings: - api_service: salt-api - api_service_details: - enabled: true - state: running - clean_config_d_dir: true - cloud: - template_sources: - maps: salt://salt/files/cloud.maps.d - profiles: salt://salt/files/cloud.profiles.d - providers: salt://salt/files/cloud.providers.d - config_path: /etc/salt - gitfs: - dulwich: - install_from_source: true - gitpython: - install_from_source: false - pygit2: - git: - install_from_package: null - require_state: false - install_from_source: false - libgit2: - build_parent_dir: /usr/src/ - download_hash: 683d1164e361e2a0a8d52652840e2340 - install_from_source: false - version: 0.23.0 - version: 0.22.1 - install_packages: true - key_url: https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3002/SALTSTACK-GPG-KEY.pub - libgit2: libgit2-22 - master: - ext_pillar: - - cmd_yaml: cat /etc/salt/yaml - - stack: - - /path/to/stack1.cfg - - /path/to/stack2.cfg - - reclass: - inventory_base_uri: /etc/reclass - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - gitfs_provider: gitpython - pillar_roots: - base: - - /srv/pillar - master_config_use_TOFS: false - master_remove_config: false - master_service: salt-master - master_service_details: - enabled: true - state: running - minion: - file_roots: - base: - - /srv/salt - fileserver_backend: - - rootfs - master: localhost - master_type: str - pillar_roots: - base: - - /srv/pillar - minion_config_use_TOFS: false - minion_remove_config: false - minion_service: salt-minion - minion_service_details: - enabled: true - state: running - parallel: true - pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/16.04/amd64/3002 xenial main - py_ver: py3 - pygit2: python-pygit2 - pyinotify: python-pyinotify - python_dulwich: python-dulwich - python_git: python-git - release: '3002' - restart_via_at: false - retry_options: - attempts: 5 - interval: 10 - splay: 10 - until: true - rootgroup: root - rootuser: root - salt_api: salt-api - salt_cloud: salt-cloud - salt_master: salt-master - salt_master_macos_plist_hash: '' - salt_minion: salt-minion - salt_minion_macos_plist_hash: '' - salt_ssh: salt-ssh - salt_syndic: salt-syndic - ssh_roster: {} - syndic_service: salt-syndic - use_pip: false - version: '' diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml index 0c5672c8e..cf21ff541 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3002 bionic main + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3002 bionic main + pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3002/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml index 15d3b76e0..7a92bad00 100644 --- a/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3002 focal main + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3002 focal main + pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3002/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3003-py3/files/_mapdata/debian-10.yaml b/test/integration/v3003-py3/files/_mapdata/debian-10.yaml index 59b87ff26..17e36b6e8 100644 --- a/test/integration/v3003-py3/files/_mapdata/debian-10.yaml +++ b/test/integration/v3003-py3/files/_mapdata/debian-10.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/debian/10/amd64/3003 buster main + 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 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3003-py3/files/_mapdata/debian-9.yaml b/test/integration/v3003-py3/files/_mapdata/debian-9.yaml index 5857760da..acf4962d8 100644 --- a/test/integration/v3003-py3/files/_mapdata/debian-9.yaml +++ b/test/integration/v3003-py3/files/_mapdata/debian-9.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/debian/9/amd64/3003 stretch main + 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 py_ver: py3 pyinotify: python-pyinotify python_dulwich: python-dulwich diff --git a/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml b/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml index 8dc4437ef..743b9df5c 100644 --- a/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/v3003-py3/files/_mapdata/ubuntu-18.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/18.04/amd64/3003 bionic main + 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 py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify diff --git a/test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml b/test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml index 7c58efa22..bec78e2dd 100644 --- a/test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/v3003-py3/files/_mapdata/ubuntu-20.yaml @@ -86,7 +86,10 @@ values: state: running parallel: true pin_version: false - pkgrepo: deb https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3003 focal main + pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] + https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3003 focal main + pkgrepo_keyring: https://repo.saltproject.io/py3/ubuntu/20.04/amd64/3003/salt-archive-keyring.gpg + pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 pygit2: python-pygit2 pyinotify: python-pyinotify