test(pillar): centralise and clean-up entries

2021-11-17 21:53:22 +00:00 · 2021-11-17 21:53:22 +00:00 · db5b69c9cd
parent b475e24638
commit db5b69c9cd
4 changed files with 4 additions and 17 deletions
--- 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
--- a/test/salt/pillar/v3001-py3.sls
+++ b/test/salt/pillar/v3001-py3.sls
@ -3,4 +3,3 @@
 ---
 salt:
  release: '3001'
-  py_ver: 'py3'
--- 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
--- 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