Browse Source

Merge pull request #511 from myii/feat/update-FreeBSD-pkgs-to-py38

feat(freebsd): update packages from `py37-*` => `py38-*`
tags/v1.9.0
Imran Iqbal 3 years ago
parent
commit
54e91cc3bd
No account linked to committer's email address
14 changed files with 72 additions and 72 deletions
  1. +3
    -3
      .github/workflows/kitchen.vagrant.yml
  2. +1
    -1
      kitchen.windows.yml
  3. +9
    -9
      salt/osmap.yaml
  4. +1
    -1
      test/integration/v3000-py2/controls/pkgs_spec.rb
  5. +1
    -1
      test/integration/v3000-py3/controls/pkgs_spec.rb
  6. +1
    -1
      test/integration/v3001-py3/controls/pkgs_spec.rb
  7. +1
    -1
      test/integration/v3002-py3/controls/pkgs_spec.rb
  8. +9
    -9
      test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml
  9. +9
    -9
      test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml
  10. +9
    -9
      test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml
  11. +1
    -1
      test/integration/v3003-py3/controls/pkgs_spec.rb
  12. +9
    -9
      test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml
  13. +9
    -9
      test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml
  14. +9
    -9
      test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml

+ 3
- 3
.github/workflows/kitchen.vagrant.yml View File

fail-fast: false fail-fast: false
matrix: matrix:
instance: instance:
- v3002-py3-freebsd-130-3002-6-py3
- v3002-py3-freebsd-122-3002-6-py3
- v3002-py3-freebsd-114-3002-6-py3
# - v3002-py3-freebsd-130-3002-6-py3
# - v3002-py3-freebsd-122-3002-6-py3
# - v3002-py3-freebsd-114-3002-6-py3
- v3002-py3-openbsd-69-3002-6-py3 - v3002-py3-openbsd-69-3002-6-py3
- v3001-py3-openbsd-68-3001-1-py3 - v3001-py3-openbsd-68-3001-1-py3
- v3003-py3-windows-10-latest-py3 - v3003-py3-windows-10-latest-py3

+ 1
- 1
kitchen.windows.yml View File



provisioner: provisioner:
salt_install: bootstrap salt_install: bootstrap
salt_bootstrap_options: -pythonVersion 3 -version 3003
salt_bootstrap_options: -pythonVersion 3 -version 3003.1
# yamllint disable rule:line-length # yamllint disable rule:line-length
init_environment: | init_environment: |
C:\salt\salt-call --local state.single file.managed ` C:\salt\salt-call --local state.single file.managed `

+ 9
- 9
salt/osmap.yaml View File

salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20 salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20


FreeBSD: FreeBSD:
salt_master: py37-salt
salt_minion: py37-salt
salt_syndic: py37-salt
salt_cloud: py37-salt
salt_api: py37-salt
salt_ssh: py37-salt
python_git: py37-GitPython
pygit2: py37-pygit2
python_dulwich: py37-dulwich
salt_master: py38-salt
salt_minion: py38-salt
salt_syndic: py38-salt
salt_cloud: py38-salt
salt_api: py38-salt
salt_ssh: py38-salt
python_git: py38-gitpython
pygit2: py38-pygit2
python_dulwich: py38-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`

+ 1
- 1
test/integration/v3000-py2/controls/pkgs_spec.rb View File

when 'arch' when 'arch'
%w[salt] %w[salt]
when /bsd$/ when /bsd$/
%w[py37-salt-3002.6]
%w[py38-salt-3002.6]
when 'windows' when 'windows'
%w[Salt\ Minion] %w[Salt\ Minion]
else else

+ 1
- 1
test/integration/v3000-py3/controls/pkgs_spec.rb View File

when 'arch' when 'arch'
%w[salt] %w[salt]
when /bsd$/ when /bsd$/
%w[py37-salt-3002.6]
%w[py38-salt-3002.6]
when 'windows' when 'windows'
%w[Salt\ Minion] %w[Salt\ Minion]
else else

+ 1
- 1
test/integration/v3001-py3/controls/pkgs_spec.rb View File

when 'arch' when 'arch'
%w[salt] %w[salt]
when /bsd$/ when /bsd$/
%w[py37-salt-3002.6]
%w[py38-salt-3002.6]
when 'windows' when 'windows'
%w[Salt\ Minion] %w[Salt\ Minion]
else else

+ 1
- 1
test/integration/v3002-py3/controls/pkgs_spec.rb View File

when 'arch' when 'arch'
%w[salt] %w[salt]
when /bsd$/ when /bsd$/
%w[py37-salt]
%w[py38-salt]
when 'windows' when 'windows'
%w[Salt\ Minion] %w[Salt\ Minion]
else else

+ 9
- 9
test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml View File

pin_version: false pin_version: false
pkgrepo: '' pkgrepo: ''
py_ver: py3 py_ver: py3
pygit2: py37-pygit2
python_dulwich: py37-dulwich
python_git: py37-GitPython
pygit2: py38-pygit2
python_dulwich: py38-dulwich
python_git: py38-gitpython
release: '3002' release: '3002'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
until: true until: true
rootgroup: wheel rootgroup: wheel
rootuser: root rootuser: root
salt_api: py37-salt
salt_cloud: py37-salt
salt_master: py37-salt
salt_api: py38-salt
salt_cloud: py38-salt
salt_master: py38-salt
salt_master_macos_plist_hash: '' salt_master_macos_plist_hash: ''
salt_minion: py37-salt
salt_minion: py38-salt
salt_minion_macos_plist_hash: '' salt_minion_macos_plist_hash: ''
salt_ssh: py37-salt
salt_syndic: py37-salt
salt_ssh: py38-salt
salt_syndic: py38-salt
ssh_roster: {} ssh_roster: {}
syndic_service: salt_syndic syndic_service: salt_syndic
use_pip: false use_pip: false

+ 9
- 9
test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml View File

pin_version: false pin_version: false
pkgrepo: '' pkgrepo: ''
py_ver: py3 py_ver: py3
pygit2: py37-pygit2
python_dulwich: py37-dulwich
python_git: py37-GitPython
pygit2: py38-pygit2
python_dulwich: py38-dulwich
python_git: py38-gitpython
release: '3002' release: '3002'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
until: true until: true
rootgroup: wheel rootgroup: wheel
rootuser: root rootuser: root
salt_api: py37-salt
salt_cloud: py37-salt
salt_master: py37-salt
salt_api: py38-salt
salt_cloud: py38-salt
salt_master: py38-salt
salt_master_macos_plist_hash: '' salt_master_macos_plist_hash: ''
salt_minion: py37-salt
salt_minion: py38-salt
salt_minion_macos_plist_hash: '' salt_minion_macos_plist_hash: ''
salt_ssh: py37-salt
salt_syndic: py37-salt
salt_ssh: py38-salt
salt_syndic: py38-salt
ssh_roster: {} ssh_roster: {}
syndic_service: salt_syndic syndic_service: salt_syndic
use_pip: false use_pip: false

+ 9
- 9
test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml View File

pin_version: false pin_version: false
pkgrepo: '' pkgrepo: ''
py_ver: py3 py_ver: py3
pygit2: py37-pygit2
python_dulwich: py37-dulwich
python_git: py37-GitPython
pygit2: py38-pygit2
python_dulwich: py38-dulwich
python_git: py38-gitpython
release: '3002' release: '3002'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
until: true until: true
rootgroup: wheel rootgroup: wheel
rootuser: root rootuser: root
salt_api: py37-salt
salt_cloud: py37-salt
salt_master: py37-salt
salt_api: py38-salt
salt_cloud: py38-salt
salt_master: py38-salt
salt_master_macos_plist_hash: '' salt_master_macos_plist_hash: ''
salt_minion: py37-salt
salt_minion: py38-salt
salt_minion_macos_plist_hash: '' salt_minion_macos_plist_hash: ''
salt_ssh: py37-salt
salt_syndic: py37-salt
salt_ssh: py38-salt
salt_syndic: py38-salt
ssh_roster: {} ssh_roster: {}
syndic_service: salt_syndic syndic_service: salt_syndic
use_pip: false use_pip: false

+ 1
- 1
test/integration/v3003-py3/controls/pkgs_spec.rb View File

when 'arch' when 'arch'
%w[salt] %w[salt]
when /bsd$/ when /bsd$/
%w[py37-salt]
%w[py38-salt]
when 'windows' when 'windows'
%w[Salt\ Minion] %w[Salt\ Minion]
else else

+ 9
- 9
test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml View File

pin_version: false pin_version: false
pkgrepo: '' pkgrepo: ''
py_ver: py3 py_ver: py3
pygit2: py37-pygit2
python_dulwich: py37-dulwich
python_git: py37-GitPython
pygit2: py38-pygit2
python_dulwich: py38-dulwich
python_git: py38-gitpython
release: '3003' release: '3003'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
until: true until: true
rootgroup: wheel rootgroup: wheel
rootuser: root rootuser: root
salt_api: py37-salt
salt_cloud: py37-salt
salt_master: py37-salt
salt_api: py38-salt
salt_cloud: py38-salt
salt_master: py38-salt
salt_master_macos_plist_hash: '' salt_master_macos_plist_hash: ''
salt_minion: py37-salt
salt_minion: py38-salt
salt_minion_macos_plist_hash: '' salt_minion_macos_plist_hash: ''
salt_ssh: py37-salt
salt_syndic: py37-salt
salt_ssh: py38-salt
salt_syndic: py38-salt
ssh_roster: {} ssh_roster: {}
syndic_service: salt_syndic syndic_service: salt_syndic
use_pip: false use_pip: false

+ 9
- 9
test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml View File

pin_version: false pin_version: false
pkgrepo: '' pkgrepo: ''
py_ver: py3 py_ver: py3
pygit2: py37-pygit2
python_dulwich: py37-dulwich
python_git: py37-GitPython
pygit2: py38-pygit2
python_dulwich: py38-dulwich
python_git: py38-gitpython
release: '3003' release: '3003'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
until: true until: true
rootgroup: wheel rootgroup: wheel
rootuser: root rootuser: root
salt_api: py37-salt
salt_cloud: py37-salt
salt_master: py37-salt
salt_api: py38-salt
salt_cloud: py38-salt
salt_master: py38-salt
salt_master_macos_plist_hash: '' salt_master_macos_plist_hash: ''
salt_minion: py37-salt
salt_minion: py38-salt
salt_minion_macos_plist_hash: '' salt_minion_macos_plist_hash: ''
salt_ssh: py37-salt
salt_syndic: py37-salt
salt_ssh: py38-salt
salt_syndic: py38-salt
ssh_roster: {} ssh_roster: {}
syndic_service: salt_syndic syndic_service: salt_syndic
use_pip: false use_pip: false

+ 9
- 9
test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml View File

pin_version: false pin_version: false
pkgrepo: '' pkgrepo: ''
py_ver: py3 py_ver: py3
pygit2: py37-pygit2
python_dulwich: py37-dulwich
python_git: py37-GitPython
pygit2: py38-pygit2
python_dulwich: py38-dulwich
python_git: py38-gitpython
release: '3003' release: '3003'
restart_via_at: false restart_via_at: false
retry_options: retry_options:
until: true until: true
rootgroup: wheel rootgroup: wheel
rootuser: root rootuser: root
salt_api: py37-salt
salt_cloud: py37-salt
salt_master: py37-salt
salt_api: py38-salt
salt_cloud: py38-salt
salt_master: py38-salt
salt_master_macos_plist_hash: '' salt_master_macos_plist_hash: ''
salt_minion: py37-salt
salt_minion: py38-salt
salt_minion_macos_plist_hash: '' salt_minion_macos_plist_hash: ''
salt_ssh: py37-salt
salt_syndic: py37-salt
salt_ssh: py38-salt
salt_syndic: py38-salt
ssh_roster: {} ssh_roster: {}
syndic_service: salt_syndic syndic_service: salt_syndic
use_pip: false use_pip: false

Loading…
Cancel
Save