ci(kitchen+travis): adjust matrix to add `3000` & remove `2017.7`

* Semi-automated using https://github.com/myii/ssf-formula/pull/136
2020-03-24 12:17:38 +00:00 · 2020-03-24 12:17:38 +00:00 · e2301d5c2f
parent ff66e5fd10
commit e2301d5c2f
2 changed files with 76 additions and 52 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -60,34 +60,40 @@ jobs:
    # 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-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-arch-base-latest-master-py2
+    # - env: INSTANCE=default-debian-10-3000-py3
+    - env: INSTANCE=default-ubuntu-1804-3000-py3
+    # - env: INSTANCE=default-centos-8-3000-py3
+    # - env: INSTANCE=default-fedora-31-3000-py3
+    - env: INSTANCE=default-opensuse-leap-151-3000-py3
+    - env: INSTANCE=default-amazonlinux-2-3000-py3
+    # - env: INSTANCE=default-arch-base-latest-3000-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-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-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-ubuntu-1804-2019-2-py2
+    # - env: INSTANCE=default-amazonlinux-1-2019-2-py2
    # - env: INSTANCE=default-arch-base-latest-2019-2-py2
-    - env: INSTANCE=default-fedora-30-2018-3-py3
+    # - env: INSTANCE=default-centos-7-2018-3-py3
+    # - env: INSTANCE=default-fedora-30-2018-3-py3
    # - env: INSTANCE=default-debian-9-2018-3-py2
+    # - env: INSTANCE=default-debian-8-2018-3-py2
+    # - env: INSTANCE=default-ubuntu-1804-2018-3-py2
    # - env: INSTANCE=default-ubuntu-1604-2018-3-py2
-    # - env: INSTANCE=default-centos-7-2018-3-py2
+    # - env: INSTANCE=default-centos-6-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-amazonlinux-1-2018-3-py2
+    - env: INSTANCE=default-arch-base-latest-2018-3-py2

    ## Define the release stage that runs `semantic-release`
    - stage: 'release'
--- a/kitchen.yml
+++ b/kitchen.yml
@ -40,6 +40,35 @@ platforms:
      image: netmanagers/salt-master-py2:arch-base-latest
      run_command: /usr/lib/systemd/systemd

+  ## SALT `3000`
+  - name: debian-10-3000-py3
+    driver:
+      image: netmanagers/salt-3000-py3:debian-10
+  - name: ubuntu-1804-3000-py3
+    driver:
+      image: netmanagers/salt-3000-py3:ubuntu-18.04
+  - name: centos-8-3000-py3
+    driver:
+      image: netmanagers/salt-3000-py3:centos-8
+  - name: fedora-31-3000-py3
+    driver:
+      image: netmanagers/salt-3000-py3:fedora-31
+  - name: opensuse-leap-151-3000-py3
+    driver:
+      image: netmanagers/salt-3000-py3: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-2-3000-py3
+    driver:
+      image: netmanagers/salt-3000-py3:amazonlinux-2
+  - name: arch-base-latest-3000-py2
+    driver:
+      image: netmanagers/salt-3000-py2:arch-base-latest
+      run_command: /usr/lib/systemd/systemd
+
  ## SALT `2019.2`
  - name: debian-10-2019-2-py3
    driver:
@ -50,9 +79,15 @@ platforms:
  - name: ubuntu-1804-2019-2-py3
    driver:
      image: netmanagers/salt-2019.2-py3:ubuntu-18.04
+  - name: ubuntu-1604-2019-2-py3
+    driver:
+      image: netmanagers/salt-2019.2-py3:ubuntu-16.04
  - name: centos-8-2019-2-py3
    driver:
      image: netmanagers/salt-2019.2-py3:centos-8
+  - name: centos-7-2019-2-py3
+    driver:
+      image: netmanagers/salt-2019.2-py3:centos-7
  - name: fedora-31-2019-2-py3
    driver:
      image: netmanagers/salt-2019.2-py3:fedora-31
@ -64,30 +99,44 @@ platforms:
    # => SCP did not finish successfully (255):  (Net::SCP::Error)
    transport:
      max_ssh_sessions: 1
-  - name: centos-7-2019-2-py2
-    driver:
-      image: netmanagers/salt-2019.2-py2:centos-7
  - name: amazonlinux-2-2019-2-py3
    driver:
      image: netmanagers/salt-2019.2-py3:amazonlinux-2
+  - name: ubuntu-1804-2019-2-py2
+    driver:
+      image: netmanagers/salt-2019.2-py2:ubuntu-18.04
+  - name: amazonlinux-1-2019-2-py2
+    driver:
+      image: netmanagers/salt-2019.2-py2:amazonlinux-1
+      run_command: /sbin/init
  - name: arch-base-latest-2019-2-py2
    driver:
      image: netmanagers/salt-2019.2-py2:arch-base-latest
      run_command: /usr/lib/systemd/systemd

  ## SALT `2018.3`
+  - name: centos-7-2018-3-py3
+    driver:
+      image: netmanagers/salt-2018.3-py3:centos-7
  - 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: debian-8-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:debian-8
+  - name: ubuntu-1804-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:ubuntu-18.04
  - name: ubuntu-1604-2018-3-py2
    driver:
      image: netmanagers/salt-2018.3-py2:ubuntu-16.04
-  - name: centos-7-2018-3-py2
+  - name: centos-6-2018-3-py2
    driver:
-      image: netmanagers/salt-2018.3-py2:centos-7
+      image: netmanagers/salt-2018.3-py2:centos-6
+      run_command: /sbin/init
  - name: opensuse-leap-151-2018-3-py2
    driver:
      image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1
@ -105,37 +154,6 @@ platforms:
      image: netmanagers/salt-2018.3-py2:arch-base-latest
      run_command: /usr/lib/systemd/systemd

-  ## SALT `2017.7`
-  - name: debian-8-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:debian-8
-  - name: ubuntu-1604-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:ubuntu-16.04
-  - name: centos-6-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:centos-6
-      run_command: /sbin/init
-  - name: fedora-30-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:fedora-30
-  - name: opensuse-leap-151-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-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-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:amazonlinux-1
-      run_command: /sbin/init
-  - name: arch-base-latest-2017-7-py2
-    driver:
-      image: netmanagers/salt-2017.7-py2:arch-base-latest
-      run_command: /usr/lib/systemd/systemd
-
 provisioner:
  name: salt_solo
  log_level: debug