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

feat(freebsd): update packages from `py37-*` => `py38-*`

.github/workflows/kitchen.vagrant.yml

@@ -14,9 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         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
           - v3001-py3-openbsd-68-3001-1-py3
           - v3003-py3-windows-10-latest-py3

kitchen.windows.yml

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

salt/osmap.yaml

@@ -64,15 +64,15 @@ MacOS:
   salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
 
 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,
 # since this is probably specific to `OpenBSD-6`

test/integration/v3000-py2/controls/pkgs_spec.rb

@@ -5,7 +5,7 @@ pkgs =
   when 'arch'
     %w[salt]
   when /bsd$/
-    %w[py37-salt-3002.6]
+    %w[py38-salt-3002.6]
   when 'windows'
     %w[Salt\ Minion]
   else

test/integration/v3000-py3/controls/pkgs_spec.rb

@@ -5,7 +5,7 @@ pkgs =
   when 'arch'
     %w[salt]
   when /bsd$/
-    %w[py37-salt-3002.6]
+    %w[py38-salt-3002.6]
   when 'windows'
     %w[Salt\ Minion]
   else

test/integration/v3001-py3/controls/pkgs_spec.rb

@@ -5,7 +5,7 @@ pkgs =
   when 'arch'
     %w[salt]
   when /bsd$/
-    %w[py37-salt-3002.6]
+    %w[py38-salt-3002.6]
   when 'windows'
     %w[Salt\ Minion]
   else

test/integration/v3002-py3/controls/pkgs_spec.rb

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

test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml

@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     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'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     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_minion: py37-salt
+    salt_minion: py38-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt
-    salt_syndic: py37-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false

test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml

@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     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'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     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_minion: py37-salt
+    salt_minion: py38-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt
-    salt_syndic: py37-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false

test/integration/v3002-py3/files/_mapdata/freebsd-13.yaml

@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     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'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     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_minion: py37-salt
+    salt_minion: py38-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt
-    salt_syndic: py37-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false

test/integration/v3003-py3/controls/pkgs_spec.rb

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

test/integration/v3003-py3/files/_mapdata/freebsd-11.yaml

@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     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'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     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_minion: py37-salt
+    salt_minion: py38-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt
-    salt_syndic: py37-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false

test/integration/v3003-py3/files/_mapdata/freebsd-12.yaml

@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     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'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     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_minion: py37-salt
+    salt_minion: py38-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt
-    salt_syndic: py37-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false

test/integration/v3003-py3/files/_mapdata/freebsd-13.yaml

@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     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'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     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_minion: py37-salt
+    salt_minion: py38-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt
-    salt_syndic: py37-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false