diff --git a/salt/osfingermap.yaml b/salt/osfingermap.yaml index d92030d1..c1a34ab1 100644 --- a/salt/osfingermap.yaml +++ b/salt/osfingermap.yaml @@ -12,6 +12,17 @@ {%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} {%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %} +Debian-11: + pygit2: python-pygit2 + gitfs: + pygit2: + install_from_source: true + version: 1.9.0 + git: + require_state: false + install_from_package: Null + libgit2: libgit2-glib-1.0-0 + 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 }}' diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml index efce8f08..1884ef73 100644 --- a/test/integration/default/files/_mapdata/debian-11.yaml +++ b/test/integration/default/files/_mapdata/debian-11.yaml @@ -32,7 +32,7 @@ values: install_from_source: false pygit2: git: - install_from_package: git + install_from_package: Null require_state: false install_from_source: true libgit2: @@ -40,9 +40,9 @@ values: download_hash: 683d1164e361e2a0a8d52652840e2340 install_from_source: false version: 0.23.0 - version: 0.22.1 + version: 1.9.0 install_packages: true - libgit2: libgit2-22 + libgit2: libgit2-glib-1.0-0 master: ext_pillar: - cmd_yaml: cat /etc/salt/yaml @@ -92,6 +92,7 @@ values: pkgrepo_keyring: https://repo.saltproject.io/py3/debian/11/amd64/3004/salt-archive-keyring.gpg pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 py_ver: py3 + pygit2: python-pygit2 pyinotify: python-pyinotify python_dulwich: python-dulwich python_git: python-git