Merge pull request #538 from llua/fbsd_pkg

update freebsd `py38-*` package names to `py39-*`
saltstack-formulas · Aug 26, 2022 · fe660a9 · fe660a9
2 parents a81ced4 + 2881fdd
commit fe660a9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/salt/osmap.yaml b/salt/osmap.yaml
@@ -66,15 +66,15 @@ MacOS:
   salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
 
 FreeBSD:
-  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
+  salt_master: py39-salt
+  salt_minion: py39-salt
+  salt_syndic: py39-salt
+  salt_cloud: py39-salt
+  salt_api: py39-salt
+  salt_ssh: py39-salt
+  python_git: py39-gitpython
+  pygit2: py39-pygit2
+  python_dulwich: py39-dulwich
 
 # If `osfingermap.yaml` is introduced in the future, perhaps better to move to there,
 # since this is probably specific to `OpenBSD-6`

diff --git a/test/integration/default/controls/pkgs_spec.rb b/test/integration/default/controls/pkgs_spec.rb
@@ -5,7 +5,7 @@
   when 'arch'
     %w[salt]
   when /bsd$/
-    %w[py38-salt]
+    %w[py39-salt]
   when 'windows'
     ['Salt Minion']
   when 'mac_os_x'

diff --git a/test/integration/default/files/_mapdata/freebsd-12.yaml b/test/integration/default/files/_mapdata/freebsd-12.yaml
@@ -88,9 +88,9 @@ values:
     pin_version: false
     pkgrepo: ''
     py_ver: py3
-    pygit2: py38-pygit2
-    python_dulwich: py38-dulwich
-    python_git: py38-gitpython
+    pygit2: py39-pygit2
+    python_dulwich: py39-dulwich
+    python_git: py39-gitpython
     release: '3004'
     restart_via_at: false
     retry_options:
@@ -100,14 +100,14 @@ values:
       until: true
     rootgroup: wheel
     rootuser: root
-    salt_api: py38-salt
-    salt_cloud: py38-salt
-    salt_master: py38-salt
+    salt_api: py39-salt
+    salt_cloud: py39-salt
+    salt_master: py39-salt
     salt_master_macos_plist_hash: ''
-    salt_minion: py38-salt
+    salt_minion: py39-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py38-salt
-    salt_syndic: py38-salt
+    salt_ssh: py39-salt
+    salt_syndic: py39-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false

diff --git a/test/integration/default/files/_mapdata/freebsd-13.yaml b/test/integration/default/files/_mapdata/freebsd-13.yaml
@@ -88,9 +88,9 @@ values:
     pin_version: false
     pkgrepo: ''
     py_ver: py3
-    pygit2: py38-pygit2
-    python_dulwich: py38-dulwich
-    python_git: py38-gitpython
+    pygit2: py39-pygit2
+    python_dulwich: py39-dulwich
+    python_git: py39-gitpython
     release: '3004'
     restart_via_at: false
     retry_options:
@@ -100,14 +100,14 @@ values:
       until: true
     rootgroup: wheel
     rootuser: root
-    salt_api: py38-salt
-    salt_cloud: py38-salt
-    salt_master: py38-salt
+    salt_api: py39-salt
+    salt_cloud: py39-salt
+    salt_master: py39-salt
     salt_master_macos_plist_hash: ''
-    salt_minion: py38-salt
+    salt_minion: py39-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py38-salt
-    salt_syndic: py38-salt
+    salt_ssh: py39-salt
+    salt_syndic: py39-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false