test(matrix): choose appropriate os

saltstack-formulas · Oct 4, 2019 · 42d9f7a · 42d9f7a
1 parent d2f2b4e
commit 42d9f7a
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,10 +33,10 @@ env:
     # INSTANCE: default-amazonlinux-2-2019-2-py2
     # - INSTANCE: default-debian-9-2018-3-py2
     # - INSTANCE: default-ubuntu-1604-2018-3-py2
-    # - INSTANCE: default-centos-7-2018-3-py2
-    - INSTANCE: default-fedora-29-2018-3-py2
+    - INSTANCE: default-centos-7-2018-3-py2
+    # INSTANCE: default-fedora-29-2018-3-py2
     - INSTANCE: default-opensuse-leap-15-2018-3-py2
-    # - INSTANCE: default-amazonlinux-2-2018-3-py2
+    - INSTANCE: default-amazonlinux-2-2018-3-py2
     # - INSTANCE: default-debian-8-2017-7-py2
     # - INSTANCE: default-ubuntu-1604-2017-7-py2
     - INSTANCE: default-centos-6-2017-7-py2

diff --git a/kitchen.yml b/kitchen.yml
@@ -47,6 +47,12 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+  - name: amazonlinux-2-develop-py2
+    driver:
+      image: netmanagers/salt-develop-py2:amazonlinux-2
+      provision_command:
+        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+        - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
 
   ## SALT `2019.2`
   - name: debian-9-2019-2-py3
@@ -69,6 +75,9 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+  - name: amazonlinux-2-2019-2-py2
+    driver:
+      image: netmanagers/salt-2019.2-py2:amazonlinux-2
 
   ## SALT `2018.3`
   - name: debian-9-2018-3-py2
@@ -91,6 +100,9 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+  - name: amazonlinux-2-2018-3-py2
+    driver:
+      image: netmanagers/salt-2018.3-py2:amazonlinux-2
 
   ## SALT `2017.7`
   - name: debian-8-2017-7-py2
@@ -114,6 +126,9 @@ platforms:
     # => SCP did not finish successfully (255):  (Net::SCP::Error)
     transport:
       max_ssh_sessions: 1
+  - name: amazonlinux-2-2017-7-py2
+    driver:
+      image: netmanagers/salt-2017.7-py2:amazonlinux-2
 
 provisioner:
   name: salt_solo
@@ -135,6 +150,9 @@ verifier:
 
 suites:
   - name: default
+    excludes:
+    - default-centos-6-2017-7-py2
+    - default-centos-7-2019-2-py3
     provisioner:
       dependencies:
         - name: lvm
@@ -146,6 +164,7 @@ suites:
             - lvm.install
             - lvm.files.create
             - lvm.pv.create
+            - iscsi.clean
             - iscsi
       pillars:
         top.sls:
@@ -157,3 +176,36 @@ suites:
     verifier:
       inspec_tests:
         - path: test/integration/default
+
+  - name: centos
+    excludes:
+    - default-debian-10-develop-py3
+    - default-ubuntu-1804-2019-2-py3
+    - default-opensuse-leap-15-2018-3-py2
+    - default-amazonlinux-2-2018-3-py2
+    provisioner:
+      dependencies:
+        - name: lvm
+          repo: git
+          source: https://github.com/saltstack-formulas/lvm-formula.git
+      state_top:
+        base:
+          '*':
+            - lvm.install
+            - lvm.files.create
+            - lvm.pv.create
+            - iscsi.initiator.clean
+            - iscsi.target.clean
+            # iscsi.isns   #Travis fails with "Service isns is enabled, and is dead"
+            - iscsi.target
+            - iscsi.initiator
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - iscsi
+      pillars_from_files:
+        iscsi.sls: test/integration/default/pillar.example.loopdevs-4-7
+    verifier:
+      inspec_tests:
+        - path: test/integration/default