From a30f124485550e487d8bd41db0549b03bbeb2d48 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Sun, 4 Apr 2021 09:41:02 +0100
Subject: [PATCH] fix(freebsd): fix package names [skip ci]

Resolves issues introduced in 24ebbb4e0c44a34fa3b20379306be67b5c03fbbe.
---
 salt/master.sls                                |  3 ---
 salt/minion.sls                                |  3 ---
 salt/osmap.yaml                                | 18 +++++++++---------
 .../v3002-py3/controls/pkgs_spec.rb            |  2 +-
 .../v3002-py3/files/_mapdata/freebsd-11.yaml   | 18 +++++++++---------
 .../v3002-py3/files/_mapdata/freebsd-12.yaml   | 18 +++++++++---------
 6 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/salt/master.sls b/salt/master.sls
index 81902df..13cc5a8 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -27,9 +27,6 @@ salt-master:
        {%- if salt_settings.version is defined %}
     - version: {{ salt_settings.version }}
        {%- endif %}
-    {%- if grains.os_family == 'FreeBSD' %}
-    - unless: pkg info | grep {{ salt_settings.salt_master }}
-    {%- endif %}
        {% if salt_settings.master_service_details.state != 'ignore' %}
     - require_in:
       - service: salt-master
diff --git a/salt/minion.sls b/salt/minion.sls
index 676ce42..5e6e854 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -71,9 +71,6 @@ salt-minion:
             {%- if salt_settings.version %}
     - version: {{ salt_settings.version }}
             {%- endif %}
-    {%- if grains.os_family == 'FreeBSD' %}
-    - unless: pkg info | grep {{ salt_settings.salt_master }}
-    {%- endif %}
             {% if salt_settings.minion_service_details.state != 'ignore' %}
     - require_in:
       - service: salt-minion
diff --git a/salt/osmap.yaml b/salt/osmap.yaml
index de9c8dc..a90b549 100644
--- a/salt/osmap.yaml
+++ b/salt/osmap.yaml
@@ -64,15 +64,15 @@ MacOS:
   salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
 
 FreeBSD:
-  salt_master: py37-salt-3002.6
-  salt_minion: py37-salt-3002.6
-  salt_syndic: py37-salt-3002.6
-  salt_cloud: py37-salt-3002.6
-  salt_api: py37-salt-3002.6
-  salt_ssh: py37-salt-3002.6
-  python_git: py37-GitPython-3.1.11
-  pygit2: py37-pygit2-1.3.0
-  python_dulwich: py37-dulwich-0.19.16
+  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
 
 # 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/v3002-py3/controls/pkgs_spec.rb b/test/integration/v3002-py3/controls/pkgs_spec.rb
index 73aee8a..a3462d0 100644
--- a/test/integration/v3002-py3/controls/pkgs_spec.rb
+++ b/test/integration/v3002-py3/controls/pkgs_spec.rb
@@ -5,7 +5,7 @@ pkgs =
   when 'arch'
     %w[salt]
   when /bsd$/
-    %w[py37-salt-3002.6]
+    %w[py37-salt]
   when 'windows'
     %w[Salt\ Minion]
   else
diff --git a/test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml b/test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml
index 0018633..fc4e15a 100644
--- a/test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml
+++ b/test/integration/v3002-py3/files/_mapdata/freebsd-11.yaml
@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     py_ver: py3
-    pygit2: py37-pygit2-1.3.0
-    python_dulwich: py37-dulwich-0.19.16
-    python_git: py37-GitPython-3.1.11
+    pygit2: py37-pygit2
+    python_dulwich: py37-dulwich
+    python_git: py37-GitPython
     release: '3002'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     rootuser: root
-    salt_api: py37-salt-3002.6
-    salt_cloud: py37-salt-3002.6
-    salt_master: py37-salt-3002.6
+    salt_api: py37-salt
+    salt_cloud: py37-salt
+    salt_master: py37-salt
     salt_master_macos_plist_hash: ''
-    salt_minion: py37-salt-3002.6
+    salt_minion: py37-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt-3002.6
-    salt_syndic: py37-salt-3002.6
+    salt_ssh: py37-salt
+    salt_syndic: py37-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false
diff --git a/test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml b/test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml
index e50ae84..9b3ad66 100644
--- a/test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml
+++ b/test/integration/v3002-py3/files/_mapdata/freebsd-12.yaml
@@ -86,9 +86,9 @@ values:
     pin_version: false
     pkgrepo: ''
     py_ver: py3
-    pygit2: py37-pygit2-1.3.0
-    python_dulwich: py37-dulwich-0.19.16
-    python_git: py37-GitPython-3.1.11
+    pygit2: py37-pygit2
+    python_dulwich: py37-dulwich
+    python_git: py37-GitPython
     release: '3002'
     restart_via_at: false
     retry_options:
@@ -98,14 +98,14 @@ values:
       until: true
     rootgroup: wheel
     rootuser: root
-    salt_api: py37-salt-3002.6
-    salt_cloud: py37-salt-3002.6
-    salt_master: py37-salt-3002.6
+    salt_api: py37-salt
+    salt_cloud: py37-salt
+    salt_master: py37-salt
     salt_master_macos_plist_hash: ''
-    salt_minion: py37-salt-3002.6
+    salt_minion: py37-salt
     salt_minion_macos_plist_hash: ''
-    salt_ssh: py37-salt-3002.6
-    salt_syndic: py37-salt-3002.6
+    salt_ssh: py37-salt
+    salt_syndic: py37-salt
     ssh_roster: {}
     syndic_service: salt_syndic
     use_pip: false