Merge pull request #221 from myii/ci/standardise-structure

chore: use `semantic-release` cross-formula standard structure

.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/

.travis.yml

+# -*- 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:

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.
+

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,6 +123,18 @@ provisioner:
   salt_copy_filter:
     - .kitchen
     - .git
+
+verifier:
+  # https://www.inspec.io/
+  name: inspec
+  sudo: true
+  # cli, documentation, html, progress, json, json-min, json-rspec, junit
+  reporter:
+    - cli
+
+suites:
+  - name: default
+    provisioner:
       state_top:
         base:
           '*':
@@ -134,16 +146,6 @@ provisioner:
               - mysql
       pillars_from_files:
         mysql.sls: test/salt/pillar/mysql.sls
-
     verifier:
-  # https://www.inspec.io/
-  name: inspec
-  sudo: true
-  # cli, documentation, html, progress, json, json-min, json-rspec, junit
-  reporter:
-    - cli
       inspec_tests:
         - path: test/integration/default
-
-suites:
-  - name: default

test/integration/default/README.md

-# 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
 

test/integration/default/inspec.yml

-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