Browse Source

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

* Automated using `ssf-formula` (v0.1.0-rc.1)
tags/v0.11.0
Imran Iqbal 5 years ago
parent
commit
e7c4cdec1c
5 changed files with 45 additions and 50 deletions
  1. +9
    -0
      .gitignore
  2. +5
    -16
      .travis.yml
  3. +24
    -29
      kitchen.yml
  4. +2
    -2
      test/integration/default/README.md
  5. +5
    -3
      test/integration/default/inspec.yml

+ 9
- 0
.gitignore View File

.kitchen .kitchen
.kitchen.local.yml .kitchen.local.yml
kitchen.local.yml kitchen.local.yml
junit-*.xml


# Translations # Translations
*.mo *.mo


# Vim # Vim
*.sw? *.sw?

## Collected when centralising formulas (check and sort)
# `collectd-formula`
.pytest_cache/
/.idea/
Dockerfile.*_*
ignore/
tmp/

+ 5
- 16
.travis.yml View File

# -*- coding: utf-8 -*-
# vim: ft=yaml
---
stages: stages:
- test - test
- commitlint - commitlint
sudo: required sudo: required
cache: bundler cache: bundler
language: ruby language: ruby
dist: xenial


services: services:
- docker - docker


# Make sure the instances listed below match up with # Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml` # 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: env:
matrix: matrix:
- INSTANCE: default-debian-9-develop-py3 - INSTANCE: default-debian-9-develop-py3
# - INSTANCE: default-ubuntu-1604-2018-3-py2 # - INSTANCE: default-ubuntu-1604-2018-3-py2
# - INSTANCE: default-centos-7-2018-3-py2 # - INSTANCE: default-centos-7-2018-3-py2
- INSTANCE: default-fedora-29-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-opensuse-leap-42-2018-3-py2
# - INSTANCE: default-debian-8-2017-7-py2 # - INSTANCE: default-debian-8-2017-7-py2
# - INSTANCE: default-ubuntu-1604-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-centos-6-2017-7-py2
# - INSTANCE: default-fedora-28-2017-7-py2 # - INSTANCE: default-fedora-28-2017-7-py2
# - INSTANCE: default-opensuse-leap-42-2017-7-py2 # - INSTANCE: default-opensuse-leap-42-2017-7-py2


script: script:
- bundle exec kitchen verify ${INSTANCE}
- bin/kitchen verify ${INSTANCE}


jobs: jobs:
include: include:

+ 24
- 29
kitchen.yml View File

- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd


## SALT 2019.2
## SALT `2019.2`
- name: debian-9-2019-2-py3 - name: debian-9-2019-2-py3
driver: driver:
image: netmanagers/salt-2019.2-py3:debian-9 image: netmanagers/salt-2019.2-py3:debian-9
image: netmanagers/salt-2019.2-py3:opensuse-leap-15 image: netmanagers/salt-2019.2-py3:opensuse-leap-15
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd


## SALT 2018.3
## SALT `2018.3`
- name: debian-9-2018-3-py2 - name: debian-9-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:debian-9 image: netmanagers/salt-2018.3-py2:debian-9
- name: fedora-29-2018-3-py2 - name: fedora-29-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:fedora-29 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 - name: opensuse-leap-42-2018-3-py2
driver: driver:
image: netmanagers/salt-2018.3-py2:opensuse-leap-42 image: netmanagers/salt-2018.3-py2:opensuse-leap-42
run_command: /usr/lib/systemd/systemd run_command: /usr/lib/systemd/systemd


## SALT 2017.7
## SALT `2017.7`
- name: debian-8-2017-7-py2 - name: debian-8-2017-7-py2
driver: driver:
image: netmanagers/salt-2017.7-py2:debian-8 image: netmanagers/salt-2017.7-py2:debian-8
- name: ubuntu-1604-2017-7-py2 - name: ubuntu-1604-2017-7-py2
driver: driver:
image: netmanagers/salt-2017.7-py2:ubuntu-16.04 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 - name: centos-6-2017-7-py2
driver: driver:
image: netmanagers/salt-2017.7-py2:centos-6 image: netmanagers/salt-2017.7-py2:centos-6
salt_copy_filter: salt_copy_filter:
- .kitchen - .kitchen
- .git - .git
dependencies:
- name: states
path: ./test/salt
state_top:
base:
'G@os_family:Suse':
- states.cron
'*':
- logrotate
- logrotate.jobs
pillars:
top.sls:
base:
'*':
- logrotate
pillars_from_files:
logrotate.sls: pillar.example


verifier: verifier:
# https://www.inspec.io/ # https://www.inspec.io/
# cli, documentation, html, progress, json, json-min, json-rspec, junit # cli, documentation, html, progress, json, json-min, json-rspec, junit
reporter: reporter:
- cli - cli
inspec_tests:
- path: test/integration/default


suites: suites:
- name: default - name: default
provisioner:
state_top:
base:
'G@os_family:Suse':
- states.cron
'*':
- logrotate
- logrotate.jobs
pillars:
top.sls:
base:
'*':
- logrotate
pillars_from_files:
logrotate.sls: pillar.example
dependencies:
- name: states
path: ./test/salt
verifier:
inspec_tests:
- path: test/integration/default

+ 2
- 2
test/integration/default/README.md View File

# 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 ## Verify a profile



+ 5
- 3
test/integration/default/inspec.yml View File

name: logrotate
title: logrotate Formula
maintainer: Saltstack-formulas
name: default
title: logrotate formula
maintainer: SaltStack Formulas
license: Apache-2.0 license: Apache-2.0
summary: Verify that the logrotate formula is setup and configured correctly summary: Verify that the logrotate formula is setup and configured correctly
supports: supports:
- platform-name: fedora - platform-name: fedora
- platform-name: opensuse - platform-name: opensuse
- platform-name: suse - platform-name: suse
- platform-name: freebsd
- platform-name: amazon

Loading…
Cancel
Save