Skip to content

Commit 49475cb

Browse files
committed
feat(formula): add salt-formula
1 parent a322da6 commit 49475cb

File tree

4 files changed

+33
-3
lines changed

4 files changed

+33
-3
lines changed

pillar.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ ssf:
8484
- prometheus
8585
- redis
8686
- rkhunter
87+
- salt
8788
- ssf
8889
- stack
8990
- sudoers

ssf/defaults.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ ssf_node_anchors:
1414
# release phase via. `pre-commit_semantic-release.sh`
1515
# An alternative method could be to use:
1616
# `git describe --abbrev=0 --tags`
17-
title: 'ci(kitchen): use `openssh.config` as `state_top`'
18-
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/33'
17+
# yamllint disable-line rule:line-length
18+
title: 'feat: use `semantic-release` cross-formula standard structure'
19+
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/31'
1920
github:
2021
owner: saltstack-formulas
2122
repo: ''
@@ -308,6 +309,9 @@ ssf:
308309
3:
309310
<<: *isk_suite_default
310311
name: suse
312+
# NOTE: Only using a basic entry for `salt-formula` for the time being,
313+
# since the use of Kitchen, InSpec & Travis is non-standard
314+
salt: *formula_default
311315
ssf: *formula_default
312316
stack: *formula_default
313317
sudoers: *formula_default

ssf/files/default/.yamllint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extends: {{ yamllint.extends }}
2222
# Not disabling via. `*.yml` since we may end up with non-Jinja YAML files here
2323
{%- elif semrel_formula == 'mysql' %}
2424
# 3. Any YAML files using Jinja (result in `yamllint` syntax errors)
25-
{%- elif semrel_formula == 'postgres' %}
25+
{%- elif semrel_formula in ['postgres', 'salt'] %}
2626
# 3. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
2727
{%- endif %}
2828
{%- set yl_ignores = {'ignore':

ssf/formulas.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -963,6 +963,31 @@ ssf:
963963
use_cirrus_ci: true
964964
use_tofs: true
965965
semrel_files: *semrel_files_default
966+
# NOTE: Only using a basic entry for `salt-formula` for the time being,
967+
# since the use of Kitchen, InSpec & Travis is non-standard
968+
salt:
969+
context:
970+
git:
971+
github:
972+
repo: salt-formula
973+
use_tofs: true
974+
yamllint:
975+
ignore:
976+
additional:
977+
- salt/osfamilymap.yaml
978+
- salt/osmap.yaml
979+
semrel_files:
980+
bin/kitchen: *file__bin__kitchen
981+
docs/CONTRIBUTING.rst: *file__docs__CONTRIBUTING--rst
982+
docs/TOFS_pattern.rst: *file__docs__TOFS_pattern--rst
983+
formula/libtofs.jinja: *file__formula__libtofs--jinja
984+
.gitignore: *file__--gitignore
985+
.yamllint: *file__--yamllint
986+
commitlint.config.js: *file__commitlint--config--js
987+
Gemfile: *file__Gemfile
988+
pre-commit_semantic-release.sh: *file__pre-commit_semantic-release--sh
989+
release-rules.js: *file__release-rules--js
990+
release.config.js: *file__release--config--js
966991
ssf:
967992
context:
968993
git:

0 commit comments

Comments
 (0)