test(fedora): merge fedora test suites and pillars

saltstack-formulas · Jan 16, 2020 · 89911dc · 89911dc
1 parent 591d85a
commit 89911dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 45 deletions.
diff --git a/test/salt/pillar/pillar.example.fedora30 → test/salt/pillar/pillar.example.fedora b/test/salt/pillar/pillar.example.fedora30 → test/salt/pillar/pillar.example.fedora
@@ -1,8 +1,8 @@
 packages:
   pkgs:
-#    held:
-#      alien: 8.95-8.fc29
-#      iotop: 0.6-18.fc29
+   # held:
+   #   alien: 8.95-8.fc29
+   #   iotop: 0.6-18.fc29
     wanted:
       - git
       - less
@@ -14,13 +14,10 @@ packages:
     required:
       pkgs:
         - git
-#        - python2-dnf-plugin-versionlock
         - python3-dnf-plugin-versionlock
-  # Not testing pips in FC29 because it still ships 2018.3.3
-  # which breaks with pip > 18 (https://github.com/saltstack/salt/issues/49967)
   pips:
     wanted:
-#      - dxpy
+      # - dxpy
       - attrs
     unwanted:
       - campbel

diff --git a/test/salt/pillar/pillar.example.fedora29 b/test/salt/pillar/pillar.example.fedora29