From db5b69c9cda824194a891c515f19baabe46748b6 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Wed, 17 Nov 2021 21:53:22 +0000
Subject: [PATCH] test(pillar): centralise and clean-up entries

---
 test/salt/pillar/salt.sls      | 4 ++++
 test/salt/pillar/v3001-py3.sls | 1 -
 test/salt/pillar/v3002-py3.sls | 8 --------
 test/salt/pillar/v3003-py3.sls | 8 --------
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/test/salt/pillar/salt.sls b/test/salt/pillar/salt.sls
index 91e0339..b469f0d 100644
--- a/test/salt/pillar/salt.sls
+++ b/test/salt/pillar/salt.sls
@@ -2,6 +2,10 @@
 # vim: ft=yaml
 ---
 salt:
+  py_ver: 'py3'
+  # Override used for FreeBSD minion service
+  retry_options:
+    attempts: 5
   master:
     fileserver_backend:
       - rootfs
diff --git a/test/salt/pillar/v3001-py3.sls b/test/salt/pillar/v3001-py3.sls
index cbeffe1..d40808e 100644
--- a/test/salt/pillar/v3001-py3.sls
+++ b/test/salt/pillar/v3001-py3.sls
@@ -3,4 +3,3 @@
 ---
 salt:
   release: '3001'
-  py_ver: 'py3'
diff --git a/test/salt/pillar/v3002-py3.sls b/test/salt/pillar/v3002-py3.sls
index e9298e8..55c9269 100644
--- a/test/salt/pillar/v3002-py3.sls
+++ b/test/salt/pillar/v3002-py3.sls
@@ -3,11 +3,3 @@
 ---
 salt:
   release: '3002'
-  py_ver: 'py3'
-
-  # Override used for FreeBSD minion service
-  retry_options:
-    attempts: 5
-    until: true
-    interval: 10
-    splay: 10
diff --git a/test/salt/pillar/v3003-py3.sls b/test/salt/pillar/v3003-py3.sls
index f97a266..bb7eff9 100644
--- a/test/salt/pillar/v3003-py3.sls
+++ b/test/salt/pillar/v3003-py3.sls
@@ -3,11 +3,3 @@
 ---
 salt:
   release: '3003'
-  py_ver: 'py3'
-
-  # Override used for FreeBSD minion service
-  retry_options:
-    attempts: 5
-    until: true
-    interval: 10
-    splay: 10