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

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

Author: aboe76

.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

@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
 stages:
   - test
   - commitlint
@@ -7,52 +10,58 @@ stages:
 sudo: required
 cache: bundler
 language: ruby
+dist: xenial
 
 services:
   - docker
 
 # Make sure the instances listed below match up with
 # the `platforms` defined in `kitchen.yml`
-# NOTE: Please try to select up to six instances that add some meaningful
-#       testing of the formula's behaviour. If possible, try to refrain from
-#       the classical "chosing all the instances because I want to test on
-#       another/all distro/s" trap: it will just add time to the testing (see
-#       the discussion on #121).  As an example, the set chosen below covers
-#       the most used distros families, systemd and non-systemd and the latest
-#       three supported Saltstack versions with python2 and 3."
-#       As for `kitchen.yml`, that should still contain all of the platforms,
-#       to allow for comprehensive local testing
-#       Ref: https://github.com/saltstack-formulas/template-formula/issues/118
-#       Ref: https://github.com/saltstack-formulas/template-formula/issues/121
 env:
   matrix:
     - INSTANCE: default-debian-9-develop-py3
+    # - INSTANCE: tables-debian-9-develop-py3
     # - INSTANCE: default-ubuntu-1804-develop-py3
+    # - INSTANCE: tables-ubuntu-1804-develop-py3
     # - INSTANCE: default-centos-7-develop-py3
+    # - INSTANCE: tables-centos-7-develop-py3
     # - INSTANCE: default-fedora-29-develop-py3
+    # - INSTANCE: tables-fedora-29-develop-py3
     # - INSTANCE: default-opensuse-leap-15-develop-py3
+    # - INSTANCE: tables-opensuse-leap-15-develop-py3
     # - INSTANCE: default-debian-9-2019-2-py3
+    # - INSTANCE: tables-debian-9-2019-2-py3
     - INSTANCE: default-ubuntu-1804-2019-2-py3
+    # - INSTANCE: tables-ubuntu-1804-2019-2-py3
     - INSTANCE: default-centos-7-2019-2-py3
+    # - INSTANCE: tables-centos-7-2019-2-py3
     # - INSTANCE: default-fedora-29-2019-2-py3
+    # - INSTANCE: tables-fedora-29-2019-2-py3
     # - INSTANCE: default-opensuse-leap-15-2019-2-py3
+    # - INSTANCE: tables-opensuse-leap-15-2019-2-py3
     # - INSTANCE: default-debian-9-2018-3-py2
+    # - INSTANCE: tables-debian-9-2018-3-py2
     # - INSTANCE: default-ubuntu-1604-2018-3-py2
+    # - INSTANCE: tables-ubuntu-1604-2018-3-py2
     # - INSTANCE: default-centos-7-2018-3-py2
+    # - INSTANCE: tables-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: tables-fedora-29-2018-3-py2
     - INSTANCE: default-opensuse-leap-42-2018-3-py2
+    # - INSTANCE: tables-opensuse-leap-42-2018-3-py2
     # - INSTANCE: default-debian-8-2017-7-py2
+    # - INSTANCE: tables-debian-8-2017-7-py2
+    # - INSTANCE: default-ubuntu-1604-2017-7-py2
     # - INSTANCE: tables-ubuntu-1604-2017-7-py2
-    # TODO: Enable after improving the formula to work with other than `systemd`
     # - INSTANCE: default-centos-6-2017-7-py2
+    # - INSTANCE: tables-centos-6-2017-7-py2
     # - INSTANCE: default-fedora-28-2017-7-py2
+    # - INSTANCE: tables-fedora-28-2017-7-py2
+    # - INSTANCE: default-opensuse-leap-42-2017-7-py2
     - INSTANCE: tables-opensuse-leap-42-2017-7-py2
 
 script:
-  - bundle exec kitchen verify ${INSTANCE}
+  - bin/kitchen verify ${INSTANCE}
 
 jobs:
   include:

Gemfile

@@ -3,3 +3,4 @@ source "https://rubygems.org"
 gem 'kitchen-docker', '>= 2.9'
 gem 'kitchen-salt', '>= 0.6.0'
 gem 'kitchen-inspec', '>= 1.1'
+

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

@@ -44,7 +44,7 @@ platforms:
         - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
       run_command: /usr/lib/systemd/systemd
 
-  ## SALT 2019.2
+  ## SALT `2019.2`
   - name: debian-9-2019-2-py3
     driver:
       image: netmanagers/salt-2019.2-py3:debian-9
@@ -62,7 +62,7 @@ platforms:
       image: netmanagers/salt-2019.2-py3:opensuse-leap-15
       run_command: /usr/lib/systemd/systemd
 
-  ## SALT 2018.3
+  ## SALT `2018.3`
   - name: debian-9-2018-3-py2
     driver:
       image: netmanagers/salt-2018.3-py2:debian-9
@@ -75,25 +75,18 @@ platforms:
   - name: fedora-29-2018-3-py2
     driver:
       image: netmanagers/salt-2018.3-py2:fedora-29
-  # TODO: Use this when fixed instead of `opensuse-leap-42`
-  # Ref: https://github.com/netmanagers/salt-image-builder/issues/2
-  # - name: opensuse-leap-15-2018-3-py2
-  #   driver:
-  #     image: netmanagers/salt-2018.3-py2:opensuse-leap-15
-  #     run_command: /usr/lib/systemd/systemd
   - name: opensuse-leap-42-2018-3-py2
     driver:
       image: netmanagers/salt-2018.3-py2:opensuse-leap-42
       run_command: /usr/lib/systemd/systemd
 
-  ## SALT 2017.7
+  ## 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
-  # TODO: Modify the formula to work for non-`systemd` platforms
   - name: centos-6-2017-7-py2
     driver:
       image: netmanagers/salt-2017.7-py2:centos-6
@@ -115,15 +108,6 @@ provisioner:
   salt_copy_filter:
     - .kitchen
     - .git
-  state_top:
-    base:
-      '*':
-        - iptables
-  pillars:
-    top.sls:
-      base:
-        '*':
-          - iptables
 
 verifier:
   # https://www.inspec.io/
@@ -136,20 +120,34 @@ verifier:
 suites:
   - name: default
     provisioner:
+      state_top:
+        base:
+          '*':
+            - iptables
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - iptables
       pillars_from_files:
         iptables.sls: test/salt/pillar/default.pillar.sls
     verifier:
       inspec_tests:
         - path: test/integration/default
   - name: tables
     provisioner:
-      pillars_from_files:
-        iptables.sls: test/salt/pillar/tables.pillar.sls
       state_top:
         base:
           '*':
             - iptables
             - iptables.tables
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - iptables
+      pillars_from_files:
+        iptables.sls: test/salt/pillar/tables.pillar.sls
     verifier:
       inspec_tests:
         - path: test/integration/tables

test/integration/default/README.md

@@ -0,0 +1,50 @@
+# InSpec Profile: `default`
+
+This shows the implementation of the `default` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
+
+## Verify a profile
+
+InSpec ships with built-in features to verify a profile structure.
+
+```bash
+$ inspec check default
+Summary
+-------
+Location: default
+Profile: profile
+Controls: 4
+Timestamp: 2019-06-24T23:09:01+00:00
+Valid: true
+
+Errors
+------
+
+Warnings
+--------
+```
+
+## Execute a profile
+
+To run all **supported** controls on a local machine use `inspec exec /path/to/profile`.
+
+```bash
+$ inspec exec default
+..
+
+Finished in 0.0025 seconds (files took 0.12449 seconds to load)
+8 examples, 0 failures
+```
+
+## Execute a specific control from a profile
+
+To run one control from the profile use `inspec exec /path/to/profile --controls name`.
+
+```bash
+$ inspec exec default --controls package
+.
+
+Finished in 0.0025 seconds (files took 0.12449 seconds to load)
+1 examples, 0 failures
+```
+
+See an [example control here](https://github.com/inspec/inspec/blob/master/examples/profile/controls/example.rb).

test/integration/default/inspec.yml

@@ -1,11 +1,14 @@
 name: default
-title: Iptables Formula
-maintainer: Saltstack-formulas org
+title: iptables formula
+maintainer: SaltStack Formulas
 license: Apache-2.0
 summary: Verify that iptables is installed and configured correctly
 supports:
-  - os-name: debian
-  - os-name: ubuntu
-  - os-name: centos
-  - os-name: fedora
-  - os-name: opensuse
+  - platform-name: debian
+  - platform-name: ubuntu
+  - platform-name: centos
+  - platform-name: fedora
+  - platform-name: opensuse
+  - platform-name: suse
+  - platform-name: freebsd
+  - platform-name: amazon

test/integration/tables/README.md

@@ -0,0 +1,50 @@
+# InSpec Profile: `tables`
+
+This shows the implementation of the `tables` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
+
+## Verify a profile
+
+InSpec ships with built-in features to verify a profile structure.
+
+```bash
+$ inspec check tables
+Summary
+-------
+Location: tables
+Profile: profile
+Controls: 4
+Timestamp: 2019-06-24T23:09:01+00:00
+Valid: true
+
+Errors
+------
+
+Warnings
+--------
+```
+
+## Execute a profile
+
+To run all **supported** controls on a local machine use `inspec exec /path/to/profile`.
+
+```bash
+$ inspec exec tables
+..
+
+Finished in 0.0025 seconds (files took 0.12449 seconds to load)
+8 examples, 0 failures
+```
+
+## Execute a specific control from a profile
+
+To run one control from the profile use `inspec exec /path/to/profile --controls name`.
+
+```bash
+$ inspec exec tables --controls package
+.
+
+Finished in 0.0025 seconds (files took 0.12449 seconds to load)
+1 examples, 0 failures
+```
+
+See an [example control here](https://github.com/inspec/inspec/blob/master/examples/profile/controls/example.rb).

test/integration/tables/inspec.yml

@@ -1,11 +1,14 @@
 name: tables
-title: Iptables Formula
-maintainer: Saltstack-formulas org
+title: iptables formula
+maintainer: SaltStack Formulas
 license: Apache-2.0
 summary: Verify that iptables is installed and configured using tables defined in pillars
 supports:
-  - os-name: debian
-  - os-name: ubuntu
-  - os-name: centos
-  - os-name: fedora
-  - os-name: opensuse
+  - platform-name: debian
+  - platform-name: ubuntu
+  - platform-name: centos
+  - platform-name: fedora
+  - platform-name: opensuse
+  - platform-name: suse
+  - platform-name: freebsd
+  - platform-name: amazon