test(fedora): merge fedora test suites and pillars

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

test/salt/pillar/pillar.example.fedora29

@@ -1,38 +0,0 @@
-packages:
-  pkgs:
-#    held:
-#      alien: 8.95-8.fc29
-#      iotop: 0.6-18.fc29
-    wanted:
-      - git
-      - less
-      - bc
-      - curl
-      - fail2ban
-    unwanted:
-      - avahi-daemon
-    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
-  #     - attrs
-  #   unwanted:
-  #     - campbel
-  #     - reverse_geocode
-  #     - indy-crypto
-  gems:
-    wanted:
-      - progressbar
-      - minitest
-    unwanted:
-      - diff-lcs
-      - kitchen-vagrant
-      - kwalify
-  remote_pkgs:
-    zoom: 'https://zoom.us/client/latest/zoom_x86_64.rpm'