ci(kitchen+travis): use tiamat pre-salted images [skip ci]

* Automated using myii/ssf-formula#255
saltstack-formulas · Sep 20, 2020 · 580d3b9 · 580d3b9
1 parent 8d8dbf0
commit 580d3b9
Show file tree

Hide file tree

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

diff --git a/kitchen.yml b/kitchen.yml
@@ -11,6 +11,32 @@ driver:
 # Make sure the platforms listed below match up with
 # the `env.matrix` instances defined in `.travis.yml`
 platforms:
+  ## SALT `tiamat`
+  - name: debian-10-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:debian-10
+  - name: debian-9-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:debian-9
+  - name: ubuntu-2004-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:ubuntu-20.04
+  - name: ubuntu-1804-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:ubuntu-18.04
+  - name: ubuntu-1604-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:ubuntu-16.04
+  - name: centos-8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:centos-8
+  - name: centos-7-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:centos-7
+  - name: amazonlinux-2-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:amazonlinux-2
+
   ## SALT `master`
   - name: debian-10-master-py3
     driver:
@@ -46,6 +72,47 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:amazonlinux-2
 
+  ## SALT `3001`
+  - name: debian-10-3001-py3
+    driver:
+      image: saltimages/salt-3001-py3:debian-10
+  - name: debian-9-3001-py3
+    driver:
+      image: saltimages/salt-3001-py3:debian-9
+  - name: ubuntu-2004-3001-py3
+    driver:
+      image: saltimages/salt-3001-py3:ubuntu-20.04
+  - name: ubuntu-1804-3001-py3
+    driver:
+      image: saltimages/salt-3001-py3:ubuntu-18.04
+  - name: centos-8-3001-py3
+    driver:
+      image: saltimages/salt-3001-py3:centos-8
+  - name: centos-7-3001-py3
+    driver:
+      image: saltimages/salt-3001-py3:centos-7
+  - name: fedora-32-3001-py3
+    driver:
+      image: saltimages/salt-3001-py3:fedora-32
+      provision_command:
+        - dnf -y reinstall udev
+  - name: fedora-31-3001-py3
+    driver:
+      image: saltimages/salt-3001-py3:fedora-31
+      provision_command:
+        - dnf -y reinstall udev
+  - name: opensuse-leap-152-3001-py3
+    driver:
+      image: saltimages/salt-3001-py3:opensuse-leap-15.2
+      run_command: /usr/lib/systemd/systemd
+    # 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-3001-py3
+    driver:
+      image: saltimages/salt-3001-py3:amazonlinux-2
+
   ## SALT `3000.3`
   - name: debian-10-3000-3-py3
     driver:
@@ -91,48 +158,6 @@ platforms:
         - pacman --noconfirm -Syu systemd
       run_command: /usr/lib/systemd/systemd
 
-  ## SALT `2019.2`
-  - name: debian-10-2019-2-py3
-    driver:
-      image: saltimages/salt-2019.2-py3:debian-10
-  - name: debian-9-2019-2-py3
-    driver:
-      image: saltimages/salt-2019.2-py3:debian-9
-  - name: ubuntu-1804-2019-2-py3
-    driver:
-      image: saltimages/salt-2019.2-py3:ubuntu-18.04
-  - name: ubuntu-1604-2019-2-py3
-    driver:
-      image: saltimages/salt-2019.2-py3:ubuntu-16.04
-  - name: centos-8-2019-2-py3
-    driver:
-      image: saltimages/salt-2019.2-py3:centos-8
-  - name: centos-7-2019-2-py3
-    driver:
-      image: saltimages/salt-2019.2-py3:centos-7
-  - name: fedora-31-2019-2-py3
-    driver:
-      image: saltimages/salt-2019.2-py3:fedora-31
-      provision_command:
-        - dnf -y reinstall udev
-  - name: opensuse-leap-152-2019-2-py3
-    driver:
-      image: saltimages/salt-2019.2-py3:opensuse-leap-15.2
-      run_command: /usr/lib/systemd/systemd
-    # 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
-    driver:
-      image: saltimages/salt-2019.2-py3:amazonlinux-2
-  - name: arch-base-latest-2019-2-py2
-    driver:
-      image: saltimages/salt-2019.2-py2:arch-base-latest
-      provision_command:
-        - pacman --noconfirm -Syu systemd
-      run_command: /usr/lib/systemd/systemd
-
 provisioner:
   name: salt_solo
   log_level: debug