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

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

Author: aboe76

.cirrus.yml

@@ -1,5 +1,8 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
 docker_builder:
-  name: Test $INSTANCE
+  name: Test ${INSTANCE}
   env:
     matrix:
       - INSTANCE: default-debian-9-develop-py3
@@ -16,15 +19,11 @@ docker_builder:
       # - 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-debian-8-2017-7-py2
       # - INSTANCE: default-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: default-fedora-28-2017-7-py2
       # - INSTANCE: default-opensuse-leap-42-2017-7-py2
   bundle_install_script: bundle install
-  verify_script: bundle exec kitchen verify $INSTANCE
+  verify_script: bin/kitchen verify ${INSTANCE}

.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:
   - commitlint
   - name: release

Gemfile

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

bin/kitchen

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'kitchen' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("test-kitchen", "kitchen")

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