From a067c5853ad996b093c503242cacbb9dfe8e43d7 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Thu, 18 Jul 2019 03:59:59 +0100
Subject: [PATCH] chore: use `semantic-release` cross-formula standard
 structure

* Automated using `ssf-formula` (v0.1.0-rc.1)
---
 .gitignore                          |  9 ++++++++
 .travis.yml                         |  5 ++++-
 docs/CONTRIBUTING.rst               |  1 +
 kitchen.yml                         | 34 +++++++++++++++--------------
 test/integration/default/README.md  |  4 ++--
 test/integration/default/inspec.yml |  4 +++-
 6 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index ba07ed8..0bbb03c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ coverage.xml
 .kitchen
 .kitchen.local.yml
 kitchen.local.yml
+junit-*.xml
 
 # Translations
 *.mo
@@ -111,3 +112,11 @@ docs/*.md
 
 # Vim
 *.sw?
+
+## Collected when centralising formulas (check and sort)
+# `collectd-formula`
+.pytest_cache/
+/.idea/
+Dockerfile.*_*
+ignore/
+tmp/
diff --git a/.travis.yml b/.travis.yml
index e26d989..f4d3d87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
 stages:
   - test
   - commitlint
@@ -42,7 +45,7 @@ env:
     # - INSTANCE: default-amazonlinux-2-2017-7-py2
 
 script:
-  - bundle exec kitchen verify ${INSTANCE}
+  - bin/kitchen verify ${INSTANCE}
 
 jobs:
   include:
diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst
index 5da9ae8..b7da8f4 100644
--- a/docs/CONTRIBUTING.rst
+++ b/docs/CONTRIBUTING.rst
@@ -156,3 +156,4 @@ An example of that:
    BREAKING CHANGE: With the removal of all of the `.sls` files under
    `template package`, this formula no longer supports the installation of
    packages.
+
diff --git a/kitchen.yml b/kitchen.yml
index 510cd28..1d201c7 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -50,7 +50,7 @@ platforms:
         - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
         - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop
 
-  ## SALT 2019.2
+  ## SALT `2019.2`
   - name: debian-9-2019-2-py3
     driver:
       image: netmanagers/salt-2019.2-py3:debian-9
@@ -71,7 +71,7 @@ platforms:
     driver:
       image: netmanagers/salt-2019.2-py2:amazonlinux-2
 
-  ## SALT 2018.3
+  ## SALT `2018.3`
   - name: debian-9-2018-3-py2
     driver:
       image: netmanagers/salt-2018.3-py2:debian-9
@@ -92,7 +92,7 @@ platforms:
     driver:
       image: netmanagers/salt-2018.3-py2:amazonlinux-2
 
-  ## SALT 2017.7
+  ## SALT `2017.7`
   - name: debian-8-2017-7-py2
     driver:
       image: netmanagers/salt-2017.7-py2:debian-8
@@ -123,17 +123,6 @@ provisioner:
   salt_copy_filter:
     - .kitchen
     - .git
-  state_top:
-    base:
-      '*':
-        - mysql
-  pillars:
-    top.sls:
-      base:
-        '*':
-          - mysql
-  pillars_from_files:
-    mysql.sls: test/salt/pillar/mysql.sls
 
 verifier:
   # https://www.inspec.io/
@@ -142,8 +131,21 @@ verifier:
   # cli, documentation, html, progress, json, json-min, json-rspec, junit
   reporter:
     - cli
-  inspec_tests:
-    - path: test/integration/default
 
 suites:
   - name: default
+    provisioner:
+      state_top:
+        base:
+          '*':
+            - mysql
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - mysql
+      pillars_from_files:
+        mysql.sls: test/salt/pillar/mysql.sls
+    verifier:
+      inspec_tests:
+        - path: test/integration/default
diff --git a/test/integration/default/README.md b/test/integration/default/README.md
index 8019607..37cf963 100644
--- a/test/integration/default/README.md
+++ b/test/integration/default/README.md
@@ -1,6 +1,6 @@
-# Default InSpec Profile
+# InSpec Profile: `default`
 
-This shows the implementation of the Default InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
+This shows the implementation of the `default` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
 
 ## Verify a profile
 
diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml
index 8a3f50e..e8225c4 100644
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@@ -1,4 +1,4 @@
-name: mysql
+name: default
 title: mysql formula
 maintainer: SaltStack Formulas
 license: Apache-2.0
@@ -10,3 +10,5 @@ supports:
   - platform-name: fedora
   - platform-name: opensuse
   - platform-name: suse
+  - platform-name: freebsd
+  - platform-name: amazon