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

feat(fedora): update for Python 3 & use latest pre-salted images

.travis.yml

@@ -59,34 +59,36 @@ jobs:
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
     - env: INSTANCE=debian-debian-10-master-py3
-    # - env: INSTANCE=ubuntu-ubuntu-1804-master-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-master-py3
+    - env: INSTANCE=ubuntu-ubuntu-1804-master-py3
     # - env: INSTANCE=centos-centos-8-master-py3
+    - env: INSTANCE=fedora-fedora-32-master-py3
     # - env: INSTANCE=fedora-fedora-31-master-py3
-    # - env: INSTANCE=suse-opensuse-leap-151-master-py3
+    # - env: INSTANCE=suse-opensuse-leap-152-master-py3
     # - env: INSTANCE=amazon-amazonlinux-2-master-py3
+    # - env: INSTANCE=debian-debian-10-3000-3-py3
+    # - env: INSTANCE=debian-debian-9-3000-3-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3000-3-py3
+    # - env: INSTANCE=centos-centos-8-3000-3-py3
+    - env: INSTANCE=centos-centos-7-3000-3-py3
+    # - env: INSTANCE=fedora-fedora-31-3000-3-py3
+    - env: INSTANCE=suse-opensuse-leap-152-3000-3-py3
+    - env: INSTANCE=amazon-amazonlinux-2-3000-3-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-3000-3-py2
+    # - env: INSTANCE=ubuntu-ubuntu-1604-3000-3-py2
+    # - env: INSTANCE=arch-arch-base-latest-3000-3-py2
     # - env: INSTANCE=debian-debian-10-2019-2-py3
     # - env: INSTANCE=debian-debian-9-2019-2-py3
-    - env: INSTANCE=ubuntu-ubuntu-1804-2019-2-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1804-2019-2-py3
+    # - env: INSTANCE=ubuntu-ubuntu-1604-2019-2-py3
     # - env: INSTANCE=centos-centos-8-2019-2-py3
+    # - env: INSTANCE=centos-centos-7-2019-2-py3
     # - env: INSTANCE=fedora-fedora-31-2019-2-py3
-    - env: INSTANCE=suse-opensuse-leap-151-2019-2-py3
-    # - env: INSTANCE=centos-centos-7-2019-2-py2
-    - env: INSTANCE=amazon-amazonlinux-2-2019-2-py3
-    # - env: INSTANCE=arch-arch-base-latest-2019-2-py2
-    - env: INSTANCE=fedora-fedora-30-2018-3-py3
-    # - env: INSTANCE=debian-debian-9-2018-3-py2
-    # - env: INSTANCE=ubuntu-ubuntu-1604-2018-3-py2
-    - env: INSTANCE=centos-centos-7-2018-3-py2
-    # - env: INSTANCE=suse-opensuse-leap-151-2018-3-py2
-    # - env: INSTANCE=amazon-amazonlinux-1-2018-3-py2
-    # - env: INSTANCE=arch-arch-base-latest-2018-3-py2
-    # - env: INSTANCE=debian-debian-8-2017-7-py2
-    # - env: INSTANCE=ubuntu-ubuntu-1604-2017-7-py2
-    # - env: INSTANCE=centos-centos-6-2017-7-py2
-    # - env: INSTANCE=fedora-fedora-30-2017-7-py2
-    # - env: INSTANCE=suse-opensuse-leap-151-2017-7-py2
-    # - env: INSTANCE=amazon-amazonlinux-1-2017-7-py2
-    - env: INSTANCE=arch-arch-base-latest-2017-7-py2
+    # - env: INSTANCE=suse-opensuse-leap-152-2019-2-py3
+    # - env: INSTANCE=amazon-amazonlinux-2-2019-2-py3
+    # - env: INSTANCE=centos-centos-6-2019-2-py2
+    # - env: INSTANCE=amazon-amazonlinux-1-2019-2-py2
+    - env: INSTANCE=arch-arch-base-latest-2019-2-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

kitchen.yml

@@ -18,130 +18,130 @@ platforms:
       provision_command:
         - apt-get install --reinstall -y udev
         - apt-get install -y snapd
+  - 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
   - name: amazonlinux-2-master-py3
     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
+      image: netmanagers/salt-3000.3-py3:debian-10
       provision_command:
         - apt-get install --reinstall -y udev
         - apt-get install -y snapd
-  - name: debian-9-2019-2-py3
+  - name: debian-9-3000-3-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:debian-9
+      image: netmanagers/salt-3000.3-py3:debian-9
       provision_command:
         - apt-get install --reinstall -y udev
         - apt-get install -y snapd
-  - name: ubuntu-1804-2019-2-py3
+  - 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-2019.2-py3:opensuse-leap-15.1
+      image: netmanagers/salt-3000.3-py3:fedora-31
+  - name: opensuse-leap-152-3000-3-py3
+    driver:
+      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
+  ## SALT `2019.2`
+  - name: debian-10-2019-2-py3
     driver:
-      image: netmanagers/salt-2018.3-py2:debian-9
+      image: netmanagers/salt-2019.2-py3:debian-10
       provision_command:
         - apt-get install --reinstall -y udev
         - apt-get install -y snapd
-  - 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
-    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
+  - 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
+      provision_command:
+        - apt-get install --reinstall -y udev
+        - apt-get install -y snapd
+  - 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-2017.7-py2:amazonlinux-1
+      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-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:
@@ -166,10 +166,10 @@ suites:
   - name: debian
     includes:
       - debian-10-master-py3
+      - debian-10-3000-3-py3
+      - debian-9-3000-3-py3
       - debian-10-2019-2-py3
       - debian-9-2019-2-py3
-      - debian-9-2018-3-py2
-      - debian-8-2017-7-py2
     provisioner:
       state_top:
         base:
@@ -192,10 +192,13 @@ suites:
         - path: test/integration/default
   - name: ubuntu
     includes:
+      - ubuntu-2004-master-py3
       - ubuntu-1804-master-py3
+      - ubuntu-1804-3000-3-py3
+      - ubuntu-1804-3000-3-py2
+      - ubuntu-1604-3000-3-py2
       - ubuntu-1804-2019-2-py3
-      - ubuntu-1604-2018-3-py2
-      - ubuntu-1604-2017-7-py2
+      - ubuntu-1604-2019-2-py3
     provisioner:
       state_top:
         base:
@@ -218,10 +221,10 @@ suites:
         - path: test/integration/default
   - name: fedora
     includes:
+      - fedora-32-master-py3
       - fedora-31-master-py3
+      - fedora-31-3000-3-py3
       - fedora-31-2019-2-py3
-      - fedora-30-2018-3-py3
-      - fedora-30-2017-7-py2
     provisioner:
       state_top:
         base:
@@ -240,10 +243,11 @@ suites:
   - name: centos
     includes:
       - centos-8-master-py3
+      - centos-8-3000-3-py3
+      - centos-7-3000-3-py3
       - centos-8-2019-2-py3
-      - centos-7-2019-2-py2
-      - centos-7-2018-3-py2
-      - centos-6-2017-7-py2
+      - centos-7-2019-2-py3
+      - centos-6-2019-2-py2
     provisioner:
       state_top:
         base:
@@ -267,9 +271,9 @@ suites:
   - name: amazon
     includes:
       - amazonlinux-2-master-py3
+      - amazonlinux-2-3000-3-py3
       - amazonlinux-2-2019-2-py3
-      - amazonlinux-1-2018-3-py2
-      - amazonlinux-1-2017-7-py2
+      - amazonlinux-1-2019-2-py2
     provisioner:
       state_top:
         base:
@@ -292,10 +296,9 @@ suites:
         - path: test/integration/default
   - name: suse
     includes:
-      - opensuse-leap-151-master-py3
-      - opensuse-leap-151-2019-2-py3
-      - opensuse-leap-151-2018-3-py2
-      - opensuse-leap-151-2017-7-py2
+      - opensuse-leap-152-master-py3
+      - opensuse-leap-152-3000-3-py3
+      - opensuse-leap-152-2019-2-py3
     provisioner:
       state_top:
         base:
@@ -313,9 +316,8 @@ suites:
         - path: test/integration/default
   - name: arch
     includes:
+      - arch-base-latest-3000-3-py2
       - arch-base-latest-2019-2-py2
-      - arch-base-latest-2018-3-py2
-      - arch-base-latest-2017-7-py2
     provisioner:
       state_top:
         base:

packages/osmap.yaml

@@ -5,14 +5,7 @@ Fedora:
   pkgs:
     required:
       pkgs:
-        - python2-dnf-plugin-versionlock
-  pips:
-    required:
-      states: []
-      pkgs:
-        - gcc
-        - python2-pip
-        - python2-devel
+        - python3-dnf-plugin-versionlock
   snaps:
     collides: ['snap']
     symlink: true