Skip to content

Commit

Permalink
chore: use semantic-release cross-formula standard structure
Browse files Browse the repository at this point in the history
* Automated using `ssf-formula` (v0.1.0-rc.1)
  • Loading branch information
myii committed Jul 18, 2019
1 parent 940e9b9 commit 64a3c26
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 20 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ coverage.xml
.kitchen
.kitchen.local.yml
kitchen.local.yml
junit-*.xml

# Translations
*.mo
Expand Down Expand Up @@ -111,3 +112,11 @@ docs/*.md

# Vim
*.sw?

## Collected when centralising formulas (check and sort)
# `collectd-formula`
.pytest_cache/
/.idea/
Dockerfile.*_*
ignore/
tmp/
34 changes: 18 additions & 16 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -123,17 +123,6 @@ provisioner:
salt_copy_filter:
- .kitchen
- .git
state_top:
base:
'*':
- template
pillars:
top.sls:
base:
'*':
- template
pillars_from_files:
template.sls: pillar.example

verifier:
# https://www.inspec.io/
Expand All @@ -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:
'*':
- template
pillars:
top.sls:
base:
'*':
- template
pillars_from_files:
template.sls: pillar.example
verifier:
inspec_tests:
- path: test/integration/default
4 changes: 2 additions & 2 deletions test/integration/default/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 4 additions & 2 deletions test/integration/default/inspec.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: template
name: default
title: template formula
maintainer: Your Name
maintainer: SaltStack Formulas
license: Apache-2.0
summary: Verify that the template formula is setup and configured correctly
supports:
Expand All @@ -10,3 +10,5 @@ supports:
- platform-name: fedora
- platform-name: opensuse
- platform-name: suse
- platform-name: freebsd
- platform-name: amazon

0 comments on commit 64a3c26

Please sign in to comment.