ci(kitchen+inspec): add fedora30 and fedora29 tests suites

.travis.yml

@@ -33,25 +33,25 @@ env:
     - INSTANCE: debian-debian-10-develop-py3
     # - INSTANCE: ubuntu-ubuntu-1804-develop-py3
     # - INSTANCE: default-centos-7-develop-py3
-    # - INSTANCE: default-fedora-30-develop-py3
+    #- INSTANCE: fedora30-fedora-30-develop-py3
     # - INSTANCE: default-opensuse-leap-15-develop-py3
     # - INSTANCE: default-amazonlinux-2-develop-py2
     # - INSTANCE: debian-debian-9-2019-2-py3
     - INSTANCE: ubuntu-ubuntu-1804-2019-2-py3
     # - INSTANCE: default-centos-7-2019-2-py3
-    # - INSTANCE: default-fedora-30-2019-2-py3
+    - INSTANCE: fedora30-fedora-30-2019-2-py3
     # - INSTANCE: default-opensuse-leap-15-2019-2-py3
     - INSTANCE: default-amazonlinux-2-2019-2-py2
     # - INSTANCE: debian-debian-9-2018-3-py2
     # - INSTANCE: ubuntu-ubuntu-1604-2018-3-py2
     # - INSTANCE: default-centos-7-2018-3-py2
-    - INSTANCE: default-fedora-29-2018-3-py2
+    - INSTANCE: fedora29-fedora-29-2018-3-py2
     - INSTANCE: default-opensuse-leap-15-2018-3-py2
     # - INSTANCE: default-amazonlinux-2-2018-3-py2
     # - INSTANCE: debian-debian-8-2017-7-py2
     # - INSTANCE: ubuntu-ubuntu-1604-2017-7-py2
     - INSTANCE: default-centos-6-2017-7-py2
-    # - INSTANCE: default-fedora-29-2017-7-py2
+    # - INSTANCE: fedora29-fedora-29-2017-7-py2
     # - INSTANCE: default-opensuse-leap-15-2017-7-py2
     # - INSTANCE: default-amazonlinux-2-2017-7-py2
 

kitchen.yml

@@ -176,3 +176,43 @@ suites:
     verifier:
       inspec_tests:
         - path: test/integration/default
+
+  - name: fedora30
+    includes:
+      - fedora-30-develop-py3
+      - fedora-30-2019-2-py3
+    provisioner:
+      state_top:
+        base:
+          '*':
+            - packages
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - packages
+      pillars_from_files:
+        packages.sls: test/salt/pillar/pillar.example.fedora30
+    verifier:
+      inspec_tests:
+        - path: test/integration/default
+
+  - name: fedora29
+    includes:
+      - fedora-29-2018-3-py2
+      - fedora-29-2017-7-py2
+    provisioner:
+      state_top:
+        base:
+          '*':
+            - packages
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - packages
+      pillars_from_files:
+        packages.sls: test/salt/pillar/pillar.example.fedora29
+    verifier:
+      inspec_tests:
+        - path: test/integration/default

test/integration/default/controls/pkgs_spec.rb

@@ -18,10 +18,12 @@ when 'redhat', 'centos'
   }
   lock_file = '/etc/yum/pluginconf.d/versionlock.list'
 when 'fedora'
-  os_packages = %w(
+  case os[:release]
-    python2-dnf-plugin-versionlock
+  when '29'
-    python3-dnf-plugin-versionlock
+    os_packages = ['python2-dnf-plugin-versionlock']
-  )
+  when '30'
+    os_packages = ['python3-dnf-plugin-versionlock']
+  end
   held_packages = {
     'alien': '8.95-8.fc29',
     'iotop': '0.6-18.fc29'

test/salt/pillar/pillar.example.fedora29

@@ -1,8 +1,8 @@
 packages:
   pkgs:
-    held:
+#    held:
-      alien: 8.95-8.fc29
+#      alien: 8.95-8.fc29
-      iotop: 0.6-18.fc29
+#      iotop: 0.6-18.fc29
     wanted:
       - git
       - less
@@ -15,7 +15,7 @@ packages:
       pkgs:
         - git
         - python2-dnf-plugin-versionlock
-        - python3-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:

test/salt/pillar/pillar.example.fedora30

@@ -0,0 +1,38 @@
+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'