Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(osfingermap): updating python git package name for Debian 11 #537

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

feat(osfingermap): updating python git package name for Debian 11 #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5076fb
feat(osfingermap): adding debian 11 gitfs confgs
vveliev-tc Jun 21, 2022
477f43e
fix: upfating _mapdata expected data
vveliev-tc Jun 21, 2022
b836fe4
Merge branch 'saltstack-formulas:master' into master
vveliev Aug 29, 2022
5ceaf00
Merge branch 'saltstack-formulas:master' into master
vveliev Jan 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions salt/osfingermap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Comment on lines +15 to +25
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case of platform updates, I think that making the new requirement the default and adding configuration for supported older ones is better.

In this case:

  • the osfamillymap.yaml should use values working for the latest version of the mainstream OS supported by the formula (Debian for Debian based OS and RedHat for RedHat based ones)
  • the osmap.yaml should use values working for the latest version of the OS supported by the formula (Ubuntu-22.04 for example)
  • the osfingermap.yaml should use values for specific older OS version supported by the formula (Ubuntu-18.04 for example)

I remember discussing this topic somewhere with @myii or the @saltstack-formula/wg or even in an issue but can't find the link now.

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 }}'
Expand Down
7 changes: 4 additions & 3 deletions test/integration/default/files/_mapdata/debian-11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@ values:
install_from_source: false
pygit2:
git:
install_from_package: git
install_from_package: Null
require_state: false
install_from_source: true
libgit2:
build_parent_dir: /usr/src/
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
Expand Down Expand Up @@ -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
Expand Down