Skip to content

Commit e32294b

Browse files
committed
chore: use standardised structure
* Automated using myii/ssf-formula#227
1 parent 47eabab commit e32294b

7 files changed

Lines changed: 228 additions & 758 deletions

File tree

.salt-lint

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
# vim: ft=yaml
33
---
44
exclude_paths: []
5-
rules: {}
5+
rules:
6+
204:
7+
ignore: 'haproxy/templates/haproxy.jinja'
68
skip_list:
79
# Using `salt-lint` for linting other files as well, such as Jinja macros/templates
810
- 205 # Use ".sls" as a Salt State file extension

.travis.yml

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,46 +58,37 @@ jobs:
5858
## Define the rest of the matrix based on Kitchen testing
5959
# Make sure the instances listed below match up with
6060
# the `platforms` defined in `kitchen.yml`
61-
# NOTE: Please try to select up to six instances that add some meaningful
62-
# testing of the formula's behaviour. If possible, try to refrain from
63-
# the classical "chosing all the instances because I want to test on
64-
# another/all distro/s" trap: it will just add time to the testing (see
65-
# the discussion on #121). As an example, the set chosen below covers
66-
# the most used distros families, systemd and non-systemd and the latest
67-
# three supported Saltstack versions with python2 and 3.
68-
# As for `kitchen.yml`, that should still contain all of the platforms,
69-
# to allow for comprehensive local testing
70-
# Ref: https://github.com/saltstack-formulas/template-formula/issues/118
71-
# Ref: https://github.com/saltstack-formulas/template-formula/issues/121
7261
- env: INSTANCE=default-debian-10-master-py3
62+
- env: INSTANCE=default-ubuntu-2004-master-py3
7363
# - env: INSTANCE=default-ubuntu-1804-master-py3
74-
- env: INSTANCE=default-centos-8-master-py3
64+
# - env: INSTANCE=default-centos-8-master-py3
65+
# - env: INSTANCE=default-fedora-32-master-py3
7566
# - env: INSTANCE=default-fedora-31-master-py3
76-
# - env: INSTANCE=default-opensuse-leap-151-master-py3
67+
# - env: INSTANCE=default-opensuse-leap-152-master-py3
7768
# - env: INSTANCE=default-amazonlinux-2-master-py3
7869
# - env: INSTANCE=default-debian-10-3000-3-py3
79-
# - env: INSTANCE=default-debian-9-3000-3-py3
70+
- env: INSTANCE=default-debian-9-3000-3-py3
8071
- env: INSTANCE=default-ubuntu-1804-3000-3-py3
8172
# - env: INSTANCE=default-centos-8-3000-3-py3
8273
# - env: INSTANCE=default-centos-7-3000-3-py3
8374
# - env: INSTANCE=default-fedora-31-3000-3-py3
84-
- env: INSTANCE=default-opensuse-leap-151-3000-3-py3
85-
- env: INSTANCE=default-amazonlinux-2-3000-3-py3
75+
# - env: INSTANCE=default-opensuse-leap-152-3000-3-py3
76+
# - env: INSTANCE=default-amazonlinux-2-3000-3-py3
8677
# - env: INSTANCE=default-ubuntu-1804-3000-3-py2
8778
# - env: INSTANCE=default-ubuntu-1604-3000-3-py2
8879
# - env: INSTANCE=default-arch-base-latest-3000-3-py2
8980
# - env: INSTANCE=default-debian-10-2019-2-py3
9081
# - env: INSTANCE=default-debian-9-2019-2-py3
9182
# - env: INSTANCE=default-ubuntu-1804-2019-2-py3
92-
# - env: INSTANCE=default-ubuntu-1604-2019-2-py3
83+
- env: INSTANCE=default-ubuntu-1604-2019-2-py3
9384
# - env: INSTANCE=default-centos-8-2019-2-py3
9485
# - env: INSTANCE=default-centos-7-2019-2-py3
95-
- env: INSTANCE=default-fedora-31-2019-2-py3
96-
# - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
86+
# - env: INSTANCE=default-fedora-31-2019-2-py3
87+
# - env: INSTANCE=default-opensuse-leap-152-2019-2-py3
9788
# - env: INSTANCE=default-amazonlinux-2-2019-2-py3
9889
# - env: INSTANCE=default-centos-6-2019-2-py2
9990
# - env: INSTANCE=default-amazonlinux-1-2019-2-py2
100-
- env: INSTANCE=default-arch-base-latest-2019-2-py2
91+
# - env: INSTANCE=default-arch-base-latest-2019-2-py2
10192

10293
## Define the release stage that runs `semantic-release`
10394
- stage: 'release'
@@ -124,3 +115,15 @@ jobs:
124115
edge: true
125116
# Run `semantic-release`
126117
script: 'npx semantic-release@15.14'
118+
119+
# Notification options: `always`, `never` or `change`
120+
notifications:
121+
webhooks:
122+
if: 'repo = saltstack-formulas/haproxy-formula'
123+
urls:
124+
- https://saltstack-formulas.zulipchat.com/api/v1/external/travis?api_key=HsIq3o5QmLxdnVCKF9is0FUIpkpAY79P&stream=CI&topic=saltstack-formulas%2Fhaproxy-formula&ignore_pull_requests=true
125+
on_success: always # default: always
126+
on_failure: always # default: always
127+
on_start: always # default: never
128+
on_cancel: always # default: always
129+
on_error: always # default: always

.yamllint

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ignore: |
1212
node_modules/
1313
test/**/states/**/*.sls
1414
.kitchen/
15+
test/salt/salt/hosts/init.sls
1516
1617
yaml-files:
1718
# Default settings

CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# SECTION: Owner(s) for everything in the repo, unless a later match takes precedence
44
# FILE PATTERN OWNER(S)
5-
* @NONE
5+
* @daks
66

77
# SECTION: Owner(s) for specific directories
88
# FILE PATTERN OWNER(S)
@@ -14,8 +14,8 @@
1414
/docs/AUTHORS.rst @saltstack-formulas/ssf
1515
/docs/CHANGELOG.rst @saltstack-formulas/ssf
1616
/docs/TOFS_pattern.rst @saltstack-formulas/ssf
17-
/template/libsaltcli.jinja @saltstack-formulas/ssf
18-
/template/libtofs.jinja @saltstack-formulas/ssf
17+
/haproxy/libsaltcli.jinja @saltstack-formulas/ssf
18+
/haproxy/libtofs.jinja @saltstack-formulas/ssf
1919
/test/integration/**/inspec.yml @saltstack-formulas/ssf
2020
/test/integration/**/README.md @saltstack-formulas/ssf
2121
/.gitignore @saltstack-formulas/ssf

0 commit comments

Comments
 (0)