Browse Source

Merge 5ceaf00a06 into 570c44b166

pull/537/merge
vveliev 11 months ago
parent
commit
dc007af681
No account linked to committer's email address
2 changed files with 15 additions and 3 deletions
  1. +11
    -0
      salt/osfingermap.yaml
  2. +4
    -3
      test/integration/default/files/_mapdata/debian-11.yaml

+ 11
- 0
salt/osfingermap.yaml View File

{%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %} {%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %} {%- 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: Oracle Linux Server-7:
pkgrepo_humanname: SaltStack repo for RHEL/CentOS {{ osmajorrelease }} pkgrepo_humanname: SaltStack repo for RHEL/CentOS {{ osmajorrelease }}
pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}' pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}'

+ 4
- 3
test/integration/default/files/_mapdata/debian-11.yaml View File

install_from_source: false install_from_source: false
pygit2: pygit2:
git: git:
install_from_package: git
install_from_package: Null
require_state: false require_state: false
install_from_source: true install_from_source: true
libgit2: libgit2:
download_hash: 683d1164e361e2a0a8d52652840e2340 download_hash: 683d1164e361e2a0a8d52652840e2340
install_from_source: false install_from_source: false
version: 0.23.0 version: 0.23.0
version: 0.22.1
version: 1.9.0
install_packages: true install_packages: true
libgit2: libgit2-22
libgit2: libgit2-glib-1.0-0
master: master:
ext_pillar: ext_pillar:
- cmd_yaml: cat /etc/salt/yaml - cmd_yaml: cat /etc/salt/yaml
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/11/amd64/3004/salt-archive-keyring.gpg pkgrepo_keyring: https://repo.saltproject.io/py3/debian/11/amd64/3004/salt-archive-keyring.gpg
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47 pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
py_ver: py3 py_ver: py3
pygit2: python-pygit2
pyinotify: python-pyinotify pyinotify: python-pyinotify
python_dulwich: python-dulwich python_dulwich: python-dulwich
python_git: python-git python_git: python-git

Loading…
Cancel
Save