From ed9063b1087d0000b803c672a05d6d13f20e7a7b Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 28 Jun 2019 04:12:32 +0100
Subject: [PATCH] ci(kitchen+cirrus): modify matrix to include `develop`
 platform

* Use balanced matrix based on `template-formula` guidelines
* Initial ref: https://github.com/saltstack-formulas/template-formula/issues/118
---
 .cirrus.yml | 15 ++++++++++-----
 kitchen.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 0ffc800..6311e59 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -13,19 +13,24 @@ docker_builder:
   name: Test $INSTANCE
   env:
     matrix:
-      - INSTANCE: default-debian-9-2019-2-py3
-      # - INSTANCE: default-ubuntu-1804-2019-2-py3
+      - INSTANCE: default-debian-9-develop-py3
+      # - INSTANCE: default-ubuntu-1804-develop-py3
+      # - INSTANCE: default-centos-7-develop-py3
+      # - INSTANCE: default-fedora-29-develop-py3
+      # - INSTANCE: default-opensuse-leap-15-develop-py3
+      # - INSTANCE: default-debian-9-2019-2-py3
+      - INSTANCE: default-ubuntu-1804-2019-2-py3
       - INSTANCE: default-centos-7-2019-2-py3
       # - INSTANCE: default-fedora-29-2019-2-py3
-      - INSTANCE: default-opensuse-leap-15-2019-2-py3
+      # - INSTANCE: default-opensuse-leap-15-2019-2-py3
       # - INSTANCE: default-debian-9-2018-3-py2
-      - INSTANCE: default-ubuntu-1604-2018-3-py2
+      # - INSTANCE: default-ubuntu-1604-2018-3-py2
       # - INSTANCE: default-centos-7-2018-3-py2
       - INSTANCE: default-fedora-29-2018-3-py2
       # TODO: Use this when fixed instead of `opensuse-leap-42`
       # Ref: https://github.com/netmanagers/salt-image-builder/issues/2
       # - INSTANCE: default-opensuse-leap-15-2018-3-py2
-      # - INSTANCE: default-opensuse-leap-42-2018-3-py2
+      - INSTANCE: default-opensuse-leap-42-2018-3-py2
       # - INSTANCE: default-debian-8-2017-7-py2
       # - INSTANCE: default-ubuntu-1604-2017-7-py2
       # TODO: Enable after improving the formula to work with other than `systemd`
diff --git a/kitchen.yml b/kitchen.yml
index 6a4fd0c..a36e5ca 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -11,6 +11,54 @@ driver:
 # Make sure the platforms listed below match up with
 # the `env.matrix` instances defined in `.travis.yml`
 platforms:
+  ## SALT `develop`
+  - name: debian-9-develop-py3
+    driver:
+      image: netmanagers/salt-develop-py3:debian-9
+      provision_command:
+        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
+    provisioner:
+      pillars_from_files:
+        rkhunter.sls: test/salt/pillar/debian.sls
+  - name: ubuntu-1804-develop-py3
+    driver:
+      image: netmanagers/salt-develop-py3:ubuntu-18.04
+      provision_command:
+        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
+    provisioner:
+      pillars_from_files:
+        rkhunter.sls: test/salt/pillar/debian.sls
+  - name: centos-7-develop-py3
+    driver:
+      image: netmanagers/salt-develop-py3:centos-7
+      provision_command:
+        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
+    provisioner:
+      pillars_from_files:
+        rkhunter.sls: test/salt/pillar/redhat.sls
+  - name: fedora-29-develop-py3
+    driver:
+      image: netmanagers/salt-develop-py3:fedora-29
+      provision_command:
+        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
+    provisioner:
+      pillars_from_files:
+        rkhunter.sls: test/salt/pillar/redhat.sls
+  - name: opensuse-leap-15-develop-py3
+    driver:
+      image: netmanagers/salt-develop-py3:opensuse-leap-15
+      provision_command:
+        - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
+        - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
+      run_command: /usr/lib/systemd/systemd
+    provisioner:
+      pillars_from_files:
+        rkhunter.sls: test/salt/pillar/suse.sls
+
   ## SALT 2019.2
   - name: debian-9-2019-2-py3
     driver: