Merge pull request #21 from myii/chore/standardise-structure

fix: debian (avoid `python-ufw`), `amazonlinux-2` & use new pre-salted images

.travis.yml

 ## Machine config
 os: 'linux'
 arch: 'amd64'
-dist: 'trusty'
+dist: 'bionic'
 version: '~> 1.0'
 
 ## Language and cache config
       name: 'Lint: salt-lint, yamllint, shellcheck & commitlint'
       before_install: 'skip'
       script:
-        # Need to use `pip3` due to using `trusty` on Travis
-        # [Py2/InsecurePlatformWarning] Tornado requires an up-to-date SSL module.
-        - sudo apt-get install python3-pip python3-setuptools python3-wheel -y
         # Install and run `salt-lint`
-        - pip3 install --user salt-lint
+        - pip install --user salt-lint
         - git ls-files -- '*.sls' '*.jinja' '*.j2' '*.tmpl' '*.tst'
                         | xargs salt-lint
         # Install and run `yamllint`
         # Need at least `v1.17.0` for the `yaml-files` setting
-        - pip3 install --user yamllint>=1.17.0
+        - pip install --user yamllint>=1.17.0
         - yamllint -s .
         # Run `shellcheck` (already pre-installed in Travis)
         - shellcheck --version
     ## Define the rest of the matrix based on Kitchen testing
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
-    # - env: INSTANCE=default-debian-10-master-py3
-    - env: INSTANCE=default-ubuntu-1804-master-py3
-    # - env: INSTANCE=default-centos-8-master-py3
-    # - env: INSTANCE=default-fedora-31-master-py3
-    # - env: INSTANCE=default-opensuse-leap-151-master-py3
-    # - env: INSTANCE=default-amazonlinux-2-master-py3
-    # - env: INSTANCE=default-debian-10-2019-2-py3
-    # - env: INSTANCE=default-debian-9-2019-2-py3
-    # - env: INSTANCE=default-ubuntu-1804-2019-2-py3
-    # - env: INSTANCE=default-centos-8-2019-2-py3
-    # - env: INSTANCE=default-fedora-31-2019-2-py3
-    # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
-    # - env: INSTANCE=default-centos-7-2019-2-py2
-    # - env: INSTANCE=default-amazonlinux-2-2019-2-py3
-    # - env: INSTANCE=default-arch-base-latest-2019-2-py2
-    - env: INSTANCE=default-fedora-30-2018-3-py3
-    # - env: INSTANCE=default-debian-9-2018-3-py2
-    # - env: INSTANCE=default-ubuntu-1604-2018-3-py2
-    # - env: INSTANCE=default-centos-7-2018-3-py2
-    - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
-    # - env: INSTANCE=default-amazonlinux-1-2018-3-py2
-    - env: INSTANCE=default-arch-base-latest-2018-3-py2
-    # - env: INSTANCE=default-debian-8-2017-7-py2
-    - env: INSTANCE=default-ubuntu-1604-2017-7-py2
-    # - env: INSTANCE=default-centos-6-2017-7-py2
-    # - env: INSTANCE=default-fedora-30-2017-7-py2
-    # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2
-    # - env: INSTANCE=default-amazonlinux-1-2017-7-py2
-    # - env: INSTANCE=default-arch-base-latest-2017-7-py2
+    - env: INSTANCE=default-debian-10-master-py3
+    - env: INSTANCE=without-ipv6-ubuntu-2004-master-py3
+    # - env: INSTANCE=without-ipv6-ubuntu-1804-master-py3
+    - env: INSTANCE=default-centos-8-master-py3
+    - env: INSTANCE=without-ipv6-fedora-32-master-py3
+    # - env: INSTANCE=without-ipv6-fedora-31-master-py3
+    # - env: INSTANCE=without-ipv6-opensuse-leap-152-master-py3
+    # - env: INSTANCE=without-ipv6-amazonlinux-2-master-py3
+    # - env: INSTANCE=without-ipv6-debian-10-3000-3-py3
+    # - env: INSTANCE=without-ipv6-debian-9-3000-3-py3
+    # - env: INSTANCE=without-ipv6-ubuntu-1804-3000-3-py3
+    # - env: INSTANCE=without-ipv6-centos-8-3000-3-py3
+    # - env: INSTANCE=without-ipv6-centos-7-3000-3-py3
+    # - env: INSTANCE=without-ipv6-fedora-31-3000-3-py3
+    - env: INSTANCE=without-ipv6-opensuse-leap-152-3000-3-py3
+    - env: INSTANCE=without-ipv6-amazonlinux-2-3000-3-py3
+    # - env: INSTANCE=without-ipv6-ubuntu-1804-3000-3-py2
+    # - env: INSTANCE=without-ipv6-ubuntu-1604-3000-3-py2
+    # - env: INSTANCE=without-ipv6-arch-base-latest-3000-3-py2
+    # - env: INSTANCE=without-ipv6-debian-10-2019-2-py3
+    # - env: INSTANCE=without-ipv6-debian-9-2019-2-py3
+    # - env: INSTANCE=without-ipv6-ubuntu-1804-2019-2-py3
+    # - env: INSTANCE=without-ipv6-ubuntu-1604-2019-2-py3
+    # - env: INSTANCE=without-ipv6-centos-8-2019-2-py3
+    # - env: INSTANCE=without-ipv6-centos-7-2019-2-py3
+    # - env: INSTANCE=without-ipv6-fedora-31-2019-2-py3
+    # - env: INSTANCE=without-ipv6-opensuse-leap-152-2019-2-py3
+    # - env: INSTANCE=without-ipv6-amazonlinux-2-2019-2-py3
+    # - env: INSTANCE=without-ipv6-centos-6-2019-2-py2
+    # - env: INSTANCE=without-ipv6-amazonlinux-1-2019-2-py2
+    - env: INSTANCE=without-ipv6-arch-base-latest-2019-2-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

kitchen.yml

   - name: debian-10-master-py3
     driver:
       image: netmanagers/salt-master-py3:debian-10
+  - name: ubuntu-2004-master-py3
+    driver:
+      image: netmanagers/salt-master-py3:ubuntu-20.04
   - name: ubuntu-1804-master-py3
     driver:
       image: netmanagers/salt-master-py3:ubuntu-18.04
   - name: centos-8-master-py3
     driver:
       image: netmanagers/salt-master-py3:centos-8
+  - name: fedora-32-master-py3
+    driver:
+      image: netmanagers/salt-master-py3:fedora-32
   - name: fedora-31-master-py3
     driver:
       image: netmanagers/salt-master-py3:fedora-31
-  - name: opensuse-leap-151-master-py3
+  - name: opensuse-leap-152-master-py3
     driver:
-      image: netmanagers/salt-master-py3:opensuse-leap-15.1
+      image: netmanagers/salt-master-py3:opensuse-leap-15.2
       run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
     driver:
       image: netmanagers/salt-master-py3:amazonlinux-2
 
-  ## SALT `2019.2`
-  - name: debian-10-2019-2-py3
+  ## SALT `3000.3`
+  - name: debian-10-3000-3-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:debian-10
-  - name: debian-9-2019-2-py3
+      image: netmanagers/salt-3000.3-py3:debian-10
+  - name: debian-9-3000-3-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:debian-9
-  - name: ubuntu-1804-2019-2-py3
+      image: netmanagers/salt-3000.3-py3:debian-9
+  - name: ubuntu-1804-3000-3-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:ubuntu-18.04
-  - name: centos-8-2019-2-py3
+      image: netmanagers/salt-3000.3-py3:ubuntu-18.04
+  - name: centos-8-3000-3-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:centos-8
-  - name: fedora-31-2019-2-py3
+      image: netmanagers/salt-3000.3-py3:centos-8
+  - name: centos-7-3000-3-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:fedora-31
-  - name: opensuse-leap-151-2019-2-py3
+      image: netmanagers/salt-3000.3-py3:centos-7
+  - name: fedora-31-3000-3-py3
+    driver:
+      image: netmanagers/salt-3000.3-py3:fedora-31
+  - name: opensuse-leap-152-3000-3-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1
+      image: netmanagers/salt-3000.3-py3:opensuse-leap-15.2
       run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: centos-7-2019-2-py2
+  - name: amazonlinux-2-3000-3-py3
     driver:
-      image: netmanagers/salt-2019.2-py2:centos-7
-  - name: amazonlinux-2-2019-2-py3
+      image: netmanagers/salt-3000.3-py3:amazonlinux-2
+  - name: ubuntu-1804-3000-3-py2
     driver:
-      image: netmanagers/salt-2019.2-py3:amazonlinux-2
-  - name: arch-base-latest-2019-2-py2
+      image: netmanagers/salt-3000.3-py2:ubuntu-18.04
+  - name: ubuntu-1604-3000-3-py2
     driver:
-      image: netmanagers/salt-2019.2-py2:arch-base-latest
+      image: netmanagers/salt-3000.3-py2:ubuntu-16.04
+  - name: arch-base-latest-3000-3-py2
+    driver:
+      image: netmanagers/salt-3000.3-py2:arch-base-latest
       run_command: /usr/lib/systemd/systemd
 
-  ## SALT `2018.3`
-  - name: fedora-30-2018-3-py3
-    driver:
-      image: netmanagers/salt-2018.3-py3:fedora-30
-  - name: debian-9-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:debian-9
-  - name: ubuntu-1604-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:ubuntu-16.04
-  - name: centos-7-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:centos-7
-  - name: opensuse-leap-151-2018-3-py2
+  ## SALT `2019.2`
+  - name: debian-10-2019-2-py3
     driver:
-      image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1
-      run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: amazonlinux-1-2018-3-py2
+      image: netmanagers/salt-2019.2-py3:debian-10
+  - name: debian-9-2019-2-py3
     driver:
-      image: netmanagers/salt-2018.3-py2:amazonlinux-1
-      run_command: /sbin/init
-  - name: arch-base-latest-2018-3-py2
+      image: netmanagers/salt-2019.2-py3:debian-9
+  - name: ubuntu-1804-2019-2-py3
     driver:
-      image: netmanagers/salt-2018.3-py2:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
-
-  ## SALT `2017.7`
-  - name: debian-8-2017-7-py2
+      image: netmanagers/salt-2019.2-py3:ubuntu-18.04
+  - name: ubuntu-1604-2019-2-py3
     driver:
-      image: netmanagers/salt-2017.7-py2:debian-8
-  - name: ubuntu-1604-2017-7-py2
+      image: netmanagers/salt-2019.2-py3:ubuntu-16.04
+  - name: centos-8-2019-2-py3
     driver:
-      image: netmanagers/salt-2017.7-py2:ubuntu-16.04
-  - name: centos-6-2017-7-py2
+      image: netmanagers/salt-2019.2-py3:centos-8
+  - name: centos-7-2019-2-py3
     driver:
-      image: netmanagers/salt-2017.7-py2:centos-6
-      run_command: /sbin/init
-  - name: fedora-30-2017-7-py2
+      image: netmanagers/salt-2019.2-py3:centos-7
+  - name: fedora-31-2019-2-py3
     driver:
-      image: netmanagers/salt-2017.7-py2:fedora-30
-  - name: opensuse-leap-151-2017-7-py2
+      image: netmanagers/salt-2019.2-py3:fedora-31
+  - name: opensuse-leap-152-2019-2-py3
     driver:
-      image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1
+      image: netmanagers/salt-2019.2-py3:opensuse-leap-15.2
       run_command: /usr/lib/systemd/systemd
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.1`:
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
-  - name: amazonlinux-1-2017-7-py2
+  - name: amazonlinux-2-2019-2-py3
+    driver:
+      image: netmanagers/salt-2019.2-py3:amazonlinux-2
+  - name: centos-6-2019-2-py2
+    driver:
+      image: netmanagers/salt-2019.2-py2:centos-6
+      run_command: /sbin/init
+  - name: amazonlinux-1-2019-2-py2
     driver:
-      image: netmanagers/salt-2017.7-py2:amazonlinux-1
+      image: netmanagers/salt-2019.2-py2:amazonlinux-1
       run_command: /sbin/init
-  - name: arch-base-latest-2017-7-py2
+  - name: arch-base-latest-2019-2-py2
     driver:
-      image: netmanagers/salt-2017.7-py2:arch-base-latest
+      image: netmanagers/salt-2019.2-py2:arch-base-latest
       run_command: /usr/lib/systemd/systemd
 
 provisioner:
 
 suites:
   - name: default
+    includes:
+      - debian-10-master-py3
+      - centos-8-master-py3
+    provisioner:
+      state_top:
+        base:
+          '*':
+            - ufw
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - ufw
+      pillars_from_files:
+        ufw.sls: test/salt/pillar/default.sls
+    verifier:
+      inspec_tests:
+        - path: test/integration/default
+  - name: without-ipv6
+    excludes:
+      - debian-10-master-py3
+      - centos-8-master-py3
     provisioner:
       state_top:
         base:
           base:
             '*':
               - ufw
+              - without-ipv6
       pillars_from_files:
         ufw.sls: test/salt/pillar/default.sls
+        without-ipv6.sls: test/salt/pillar/without-ipv6.sls
     verifier:
       inspec_tests:
         - path: test/integration/default

test/salt/pillar/without-ipv6.sls

+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+ufw:
+  settings:
+    ipv6: false

ufw/osfamilymap.yaml

 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
-Debian:
-  packages:
-    - python-ufw
+Debian: {}
 RedHat: {}
 Suse:
   packages:

ufw/osfingermap.yaml

 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
-Debian-8: {}
+# os: Debian
+Debian-10: {}
 Debian-9: {}
-Ubuntu-16.04: {}
+Debian-8:
+  packages:
+    - python-ufw
+
+# os: Ubuntu
+Ubuntu-20.04: {}
 Ubuntu-18.04: {}
-Fedora-28: {}
-Fedora-29: {}
-CentOS-7: {}
+Ubuntu-16.04:
+  packages:
+    - python-ufw
+
+# os: Fedora
+Fedora-32: {}
+Fedora-31: {}
+
+# os: CentOS
+CentOS Linux-8: {}
+CentOS Linux-7: {}
 CentOS-6: {}
-openSUSE-4.23: {}
+
+# os: Amazon
+Amazon Linux-2: {}
+Amazon Linux AMI-2018: {}
+
+# os: SUSE
+Leap-15: {}
+
+# os: FreeBSD
+FreeBSD-12: {}
+
+# os: Windows
+Windows-8.1: {}
+
+# os: Gentoo
+Gentoo-2: {}

ufw/package/install.sls

 {%- from tplroot ~ "/map.jinja" import ufw with context %}
 
 ufw-package-install-pkg-installed:
+  {%- if grains.get('osfinger', '') == 'Amazon Linux-2' %}
+  pkgrepo.managed:
+    - name: epel
+    - humanname: Extra Packages for Enterprise Linux 7 - $basearch
+    - mirrorlist: https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch
+    - enabled: 1
+    - gpgcheck: 1
+    - gpgkey: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
+    - failovermethod: priority
+    - require_in:
+      - pkg: ufw-package-install-pkg-installed
+  {%- endif %}
   pkg.installed:
     - name: {{ ufw.package }}