Merge pull request #51 from myii/ci/add-3000.1-and-remove-2017.7

ci(kitchen+travis): adjust matrix to add `3000.1` & remove `2017.7`
saltstack-formulas · Apr 10, 2020 · 6da8319 · 6da8319
2 parents 5afc701 + 37ce4f4
commit 6da8319
Show file tree

Hide file tree

Showing 2 changed files with 88 additions and 64 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -70,35 +70,41 @@ jobs:
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
     - env: INSTANCE=debian-10-master-py3
-    # - env: INSTANCE=ubuntu-1804-master-py3
-    # - env: INSTANCE=centos-8-master-py3
-    # - env: INSTANCE=fedora-31-master-py3
-    # - env: INSTANCE=opensuse-leap-151-master-py3
-    # - env: INSTANCE=amazonlinux-2-master-py3
-    # - env: INSTANCE=arch-base-latest-master-py2
-    # - env: INSTANCE=debian-10-2019-2-py3
-    # - env: INSTANCE=debian-9-2019-2-py3
-    - env: INSTANCE=prod-server-ubuntu-1804-2019-2-py3
-    # - env: INSTANCE=centos-8-2019-2-py3
+    # - env: INSTANCE=prod-server-ubuntu-1804-master-py3
+    - env: INSTANCE=prod-server-centos-8-master-py3
+    # - env: INSTANCE=prod-server-fedora-31-master-py3
+    # - env: INSTANCE=prod-server-opensuse-leap-151-master-py3
+    # - env: INSTANCE=prod-server-amazonlinux-2-master-py3
+    # - env: INSTANCE=prod-server-arch-base-latest-master-py2
+    # - env: INSTANCE=prod-server-debian-10-3000-1-py3
+    - env: INSTANCE=prod-server-ubuntu-1804-3000-1-py3
+    # - env: INSTANCE=prod-server-centos-8-3000-1-py3
+    # - env: INSTANCE=prod-server-fedora-31-3000-1-py3
+    - env: INSTANCE=prod-server-opensuse-leap-151-3000-1-py3
+    - env: INSTANCE=prod-server-amazonlinux-2-3000-1-py3
+    # - env: INSTANCE=prod-server-arch-base-latest-3000-1-py2
+    # - env: INSTANCE=prod-server-debian-10-2019-2-py3
+    # - env: INSTANCE=prod-server-debian-9-2019-2-py3
+    # - env: INSTANCE=prod-server-ubuntu-1804-2019-2-py3
+    # - env: INSTANCE=prod-server-ubuntu-1604-2019-2-py3
+    # - env: INSTANCE=prod-server-centos-8-2019-2-py3
+    # - env: INSTANCE=prod-server-centos-7-2019-2-py3
     - env: INSTANCE=prod-server-fedora-31-2019-2-py3
-    # - env: INSTANCE=opensuse-leap-151-2019-2-py3
-    # - env: INSTANCE=centos-7-2019-2-py2
-    - env: INSTANCE=prod-server-amazonlinux-2-2019-2-py3
-    # - env: INSTANCE=arch-base-latest-2019-2-py2
-    # - env: INSTANCE=fedora-30-2018-3-py3
-    # - env: INSTANCE=debian-9-2018-3-py2
-    # - env: INSTANCE=ubuntu-1604-2018-3-py2
-    - env: INSTANCE=prod-server-centos-7-2018-3-py2
-    - env: INSTANCE=prod-server-opensuse-leap-151-2018-3-py2
-    # - env: INSTANCE=amazonlinux-1-2018-3-py2
-    # - env: INSTANCE=arch-base-latest-2018-3-py2
-    # - env: INSTANCE=debian-8-2017-7-py2
-    # - env: INSTANCE=ubuntu-1604-2017-7-py2
-    # - env: INSTANCE=centos-6-2017-7-py2
-    # - env: INSTANCE=fedora-30-2017-7-py2
-    # - env: INSTANCE=opensuse-leap-151-2017-7-py2
-    # - env: INSTANCE=amazonlinux-1-2017-7-py2
-    - env: INSTANCE=prod-server-arch-base-latest-2017-7-py2
+    # - env: INSTANCE=prod-server-opensuse-leap-151-2019-2-py3
+    # - env: INSTANCE=prod-server-amazonlinux-2-2019-2-py3
+    # - env: INSTANCE=prod-server-ubuntu-1804-2019-2-py2
+    # - env: INSTANCE=prod-server-amazonlinux-1-2019-2-py2
+    # - env: INSTANCE=prod-server-arch-base-latest-2019-2-py2
+    # - env: INSTANCE=prod-server-centos-7-2018-3-py3
+    # - env: INSTANCE=prod-server-fedora-30-2018-3-py3
+    # - env: INSTANCE=prod-server-debian-9-2018-3-py2
+    # - env: INSTANCE=prod-server-debian-8-2018-3-py2
+    # - env: INSTANCE=prod-server-ubuntu-1804-2018-3-py2
+    # - env: INSTANCE=prod-server-ubuntu-1604-2018-3-py2
+    # - env: INSTANCE=prod-server-centos-6-2018-3-py2
+    # - env: INSTANCE=prod-server-opensuse-leap-151-2018-3-py2
+    # - env: INSTANCE=prod-server-amazonlinux-1-2018-3-py2
+    - env: INSTANCE=prod-server-arch-base-latest-2018-3-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

diff --git 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.1`
+  - name: debian-10-3000-1-py3
+    driver:
+      image: netmanagers/salt-3000.1-py3:debian-10
+  - name: ubuntu-1804-3000-1-py3
+    driver:
+      image: netmanagers/salt-3000.1-py3:ubuntu-18.04
+  - name: centos-8-3000-1-py3
+    driver:
+      image: netmanagers/salt-3000.1-py3:centos-8
+  - name: fedora-31-3000-1-py3
+    driver:
+      image: netmanagers/salt-3000.1-py3:fedora-31
+  - name: opensuse-leap-151-3000-1-py3
+    driver:
+      image: netmanagers/salt-3000.1-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-1-py3
+    driver:
+      image: netmanagers/salt-3000.1-py3:amazonlinux-2
+  - name: arch-base-latest-3000-1-py2
+    driver:
+      image: netmanagers/salt-3000.1-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