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

feat(python3): update for `ubuntu-20.04` & `fedora-32` (also use latest pre-salted images)
saltstack-formulas · Jun 1, 2020 · 06f392b · 06f392b
2 parents ff291bb + a531d38
commit 06f392b
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 77 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -59,30 +59,34 @@ jobs:
     # 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-2004-master-py3
     # - env: INSTANCE=default-ubuntu-1804-master-py3
     # - env: INSTANCE=default-centos-8-master-py3
+    - env: INSTANCE=default-fedora-32-master-py3
     # - env: INSTANCE=default-fedora-31-master-py3
-    # - env: INSTANCE=default-opensuse-leap-151-master-py3
+    # - env: INSTANCE=default-opensuse-leap-152-master-py3
     # - env: INSTANCE=default-amazonlinux-2-master-py3
+    # - env: INSTANCE=default-debian-10-3000-3-py3
+    # - env: INSTANCE=default-debian-9-3000-3-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-3-py3
+    # - env: INSTANCE=default-centos-8-3000-3-py3
+    - env: INSTANCE=default-centos-7-3000-3-py3
+    # - env: INSTANCE=default-fedora-31-3000-3-py3
+    - env: INSTANCE=default-opensuse-leap-152-3000-3-py3
+    - env: INSTANCE=default-amazonlinux-2-3000-3-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-3-py2
+    # - env: INSTANCE=default-ubuntu-1604-3000-3-py2
+    # - env: INSTANCE=default-arch-base-latest-3000-3-py2
+    # - 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-ubuntu-1804-2019-2-py3
+    # - env: INSTANCE=default-ubuntu-1604-2019-2-py3
     # - env: INSTANCE=default-centos-8-2019-2-py3
+    # - env: INSTANCE=default-centos-7-2019-2-py3
     # - env: INSTANCE=default-fedora-31-2019-2-py3
-    - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
-    - env: INSTANCE=default-amazonlinux-2-2019-2-py3
-    # - env: INSTANCE=default-centos-7-2019-2-py2
-    # - 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-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-fedora-30-2017-7-py2
-    # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2
-    # - env: INSTANCE=default-arch-base-latest-2017-7-py2
+    # - env: INSTANCE=default-opensuse-leap-152-2019-2-py3
+    # - env: INSTANCE=default-amazonlinux-2-2019-2-py3
+    - env: INSTANCE=default-arch-base-latest-2019-2-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

diff --git a/kitchen.yml b/kitchen.yml
@@ -15,118 +15,120 @@ platforms:
   - 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
+      provision_command:
+        - dnf -y reinstall udev
   - name: fedora-31-master-py3
     driver:
       image: netmanagers/salt-master-py3:fedora-31
       provision_command:
         - dnf -y reinstall udev
-  - 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-9-2019-2-py3
+  ## SALT `3000.3`
+  - name: debian-10-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-10
+  - name: debian-9-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:debian-9
+  - name: ubuntu-1804-3000-3-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:centos-8
-  - name: fedora-31-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:fedora-31
+      image: netmanagers/salt-3000.3-py3:centos-8
+  - name: centos-7-3000-3-py3
+    driver:
+      image: netmanagers/salt-3000.3-py3:centos-7
+  - name: fedora-31-3000-3-py3
+    driver:
+      image: netmanagers/salt-3000.3-py3:fedora-31
       provision_command:
         - dnf -y reinstall udev
-  - name: opensuse-leap-151-2019-2-py3
+  - 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: amazonlinux-2-2019-2-py3
+  - name: amazonlinux-2-3000-3-py3
     driver:
-      image: netmanagers/salt-2019.2-py3:amazonlinux-2
-  - name: centos-7-2019-2-py2
+      image: netmanagers/salt-3000.3-py3:amazonlinux-2
+  - name: ubuntu-1804-3000-3-py2
     driver:
-      image: netmanagers/salt-2019.2-py2:centos-7
-  - 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
       provision_command:
         - pacman --noconfirm -Syu systemd
       run_command: /usr/lib/systemd/systemd
 
-  ## SALT `2018.3`
-  - name: fedora-30-2018-3-py3
-    driver:
-      image: netmanagers/salt-2018.3-py3:fedora-30
-      provision_command:
-        - dnf -y reinstall udev
-  - name: debian-9-2018-3-py2
-    driver:
-      image: netmanagers/salt-2018.3-py2:debian-9
-  - name: ubuntu-1604-2018-3-py2
+  ## SALT `2019.2`
+  - name: debian-10-2019-2-py3
     driver:
-      image: netmanagers/salt-2018.3-py2:ubuntu-16.04
-  - name: centos-7-2018-3-py2
+      image: netmanagers/salt-2019.2-py3:debian-10
+  - name: debian-9-2019-2-py3
     driver:
-      image: netmanagers/salt-2018.3-py2:centos-7
-  - name: opensuse-leap-151-2018-3-py2
+      image: netmanagers/salt-2019.2-py3:debian-9
+  - name: ubuntu-1804-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: arch-base-latest-2018-3-py2
+      image: netmanagers/salt-2019.2-py3:ubuntu-18.04
+  - name: ubuntu-1604-2019-2-py3
     driver:
-      image: netmanagers/salt-2018.3-py2:arch-base-latest
-      provision_command:
-        - pacman --noconfirm -Syu systemd
-      run_command: /usr/lib/systemd/systemd
-
-  ## SALT `2017.7`
-  - name: debian-8-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:debian-8
-  - name: ubuntu-1604-2017-7-py2
+      image: netmanagers/salt-2019.2-py3:centos-8
+  - name: centos-7-2019-2-py3
     driver:
-      image: netmanagers/salt-2017.7-py2:ubuntu-16.04
-  - 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
+      image: netmanagers/salt-2019.2-py3:fedora-31
       provision_command:
         - dnf -y reinstall udev
-  - name: opensuse-leap-151-2017-7-py2
+  - 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: arch-base-latest-2017-7-py2
+  - name: amazonlinux-2-2019-2-py3
     driver:
-      image: netmanagers/salt-2017.7-py2:arch-base-latest
+      image: netmanagers/salt-2019.2-py3:amazonlinux-2
+  - name: arch-base-latest-2019-2-py2
+    driver:
+      image: netmanagers/salt-2019.2-py2:arch-base-latest
       provision_command:
         - pacman --noconfirm -Syu systemd
       run_command: /usr/lib/systemd/systemd

diff --git a/systemd/osfingermap.yaml b/systemd/osfingermap.yaml
@@ -7,6 +7,9 @@
 # Only add an `osfinger` which is/will be supported by the formula
 # (empty `osfinger`s do not need to be listed, just added here as an example).
 ---
+Ubuntu-20.04:
+  pkgs_extra:
+    - python3-systemd
 Ubuntu-18.04: {}
 CentOS Linux-8:
   pkgs_lib:

diff --git a/systemd/osmap.yaml b/systemd/osmap.yaml
@@ -12,7 +12,6 @@ Fedora:
   pkgs_libs:
     - systemd-libs
   pkgs_extra:
-    - python2-systemd
     - python3-systemd
   networkd:
     pkg: {}