saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #538 from llua/fbsd_pkg

Browse Source 
update freebsd `py38-*` package names to `py39-*`
This commit is contained in:
sticky-note 2022-08-27 08:04:33 +11:00 committed by GitHub
commit fe660a9f9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/osmap.yaml
View File

@ -66,15 +66,15 @@ MacOS:
salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20 salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
FreeBSD: FreeBSD:
salt_master: py38-salt salt_master: py39-salt
salt_minion: py38-salt salt_minion: py39-salt
salt_syndic: py38-salt salt_syndic: py39-salt
salt_cloud: py38-salt salt_cloud: py39-salt
salt_api: py38-salt salt_api: py39-salt
salt_ssh: py38-salt salt_ssh: py39-salt
python_git: py38-gitpython python_git: py39-gitpython
pygit2: py38-pygit2 pygit2: py39-pygit2
python_dulwich: py38-dulwich python_dulwich: py39-dulwich
# If `osfingermap.yaml` is introduced in the future, perhaps better to move to there, # If `osfingermap.yaml` is introduced in the future, perhaps better to move to there,
# since this is probably specific to `OpenBSD-6` # since this is probably specific to `OpenBSD-6`

2
test/integration/default/controls/pkgs_spec.rb
View File

@ -5,7 +5,7 @@ pkgs =
when 'arch' when 'arch'
%w[salt] %w[salt]
when /bsd$/ when /bsd$/
%w[py38-salt] %w[py39-salt]
when 'windows' when 'windows'
['Salt Minion'] ['Salt Minion']
when 'mac_os_x' when 'mac_os_x'

18
test/integration/default/files/_mapdata/freebsd-12.yaml
View File

@ -88,9 +88,9 @@ values:
pin_version: false pin_version: false
pkgrepo: '' pkgrepo: ''
py_ver: py3 py_ver: py3
pygit2: py38-pygit2 pygit2: py39-pygit2
python_dulwich: py38-dulwich python_dulwich: py39-dulwich
python_git: py38-gitpython python_git: py39-gitpython
release: '3004' release: '3004'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
@ -100,14 +100,14 @@ values:
until: true until: true
rootgroup: wheel rootgroup: wheel
rootuser: root rootuser: root
salt_api: py38-salt salt_api: py39-salt
salt_cloud: py38-salt salt_cloud: py39-salt
salt_master: py38-salt salt_master: py39-salt
salt_master_macos_plist_hash: '' salt_master_macos_plist_hash: ''
salt_minion: py38-salt salt_minion: py39-salt
salt_minion_macos_plist_hash: '' salt_minion_macos_plist_hash: ''
salt_ssh: py38-salt salt_ssh: py39-salt
salt_syndic: py38-salt salt_syndic: py39-salt
ssh_roster: {} ssh_roster: {}
syndic_service: salt_syndic syndic_service: salt_syndic
use_pip: false use_pip: false

18
test/integration/default/files/_mapdata/freebsd-13.yaml
View File

@ -88,9 +88,9 @@ values:
pin_version: false pin_version: false
pkgrepo: '' pkgrepo: ''
py_ver: py3 py_ver: py3
pygit2: py38-pygit2 pygit2: py39-pygit2
python_dulwich: py38-dulwich python_dulwich: py39-dulwich
python_git: py38-gitpython python_git: py39-gitpython
release: '3004' release: '3004'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
@ -100,14 +100,14 @@ values:
until: true until: true
rootgroup: wheel rootgroup: wheel
rootuser: root rootuser: root
salt_api: py38-salt salt_api: py39-salt
salt_cloud: py38-salt salt_cloud: py39-salt
salt_master: py38-salt salt_master: py39-salt
salt_master_macos_plist_hash: '' salt_master_macos_plist_hash: ''
salt_minion: py38-salt salt_minion: py39-salt
salt_minion_macos_plist_hash: '' salt_minion_macos_plist_hash: ''
salt_ssh: py38-salt salt_ssh: py39-salt
salt_syndic: py38-salt salt_syndic: py39-salt
ssh_roster: {} ssh_roster: {}
syndic_service: salt_syndic syndic_service: salt_syndic
use_pip: false use_pip: false