Skip to content

Commit 916ca22

Browse files
myiimyii
committed
feat(formula): add packages-formula
* saltstack-formulas/packages-formula#61 * Previous PR: - saltstack-formulas/packages-formula#54
1 parent 98c7c8d commit 916ca22

File tree

4 files changed

+130
-29
lines changed

4 files changed

+130
-29
lines changed

‎pillar.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ ssf:
103103
- ntp
104104
- openssh
105105
- openvpn
106+
- packages
106107
- php
107108
- postfix
108109
- postgres

‎ssf/defaults.yaml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ ssf_node_anchors:
1717
pr: 'chore/standardise-structure'
1818
upstream: 'upstream'
1919
commit:
20-
# NOTE: The version number in the `body` is automatically updated during the
21-
# release phase via. `pre-commit_semantic-release.sh`
20+
# NOTE: The version number in the `body` is automatically updated during
21+
# the release phase via. `pre-commit_semantic-release.sh`
2222
# An alternative method could be to use:
2323
# `git describe --abbrev=0 --tags`
2424
# yamllint disable rule:line-length
2525
title: 'feat(semantic-release): implement for this formula'
26-
body: '* Automated using https://github.com/myii/ssf-formula/pull/108'
26+
body: '* Checked using https://github.com/myii/ssf-formula/pull/34'
2727
# yamllint enable rule:line-length
2828
github:
2929
owner: 'saltstack-formulas'
@@ -350,22 +350,25 @@ ssf:
350350
<<: *isk_default
351351
1:
352352
<<: *isk_suite_default
353-
name: 'deb'
353+
name: 'debian'
354354
2:
355355
<<: *isk_suite_default
356-
name: 'ubu18'
356+
name: 'ubuntu'
357357
3:
358358
<<: *isk_suite_default
359-
name: 'ubu16'
359+
name: 'fedora'
360360
4:
361361
<<: *isk_suite_default
362-
name: 'fed'
362+
name: 'centos'
363363
5:
364364
<<: *isk_suite_default
365-
name: 'sus'
365+
name: 'amazon'
366366
6:
367367
<<: *isk_suite_default
368-
name: 'rpm'
368+
name: 'suse'
369+
7:
370+
<<: *isk_suite_default
371+
name: 'arch'
369372
php:
370373
<<: *formula_default
371374
context:

‎ssf/files/tofs_template-formula/docs/CONTRIBUTING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ These formulas are already compatible with semantic-release:
197197
#. `ntp-formula <https://github.com/saltstack-formulas/ntp-formula>`_
198198
#. `openssh-formula <https://github.com/saltstack-formulas/openssh-formula>`_
199199
#. `openvpn-formula <https://github.com/saltstack-formulas/openvpn-formula>`_
200-
#. [`WIP <https://github.com/saltstack-formulas/packages-formula/pull/54>`_] `packages-formula <https://github.com/saltstack-formulas/packages-formula>`_
200+
#. `packages-formula <https://github.com/saltstack-formulas/packages-formula>`_
201201
#. `php-formula <https://github.com/saltstack-formulas/php-formula>`_
202202
#. `postfix-formula <https://github.com/saltstack-formulas/postfix-formula>`_
203203
#. `postgres-formula <https://github.com/saltstack-formulas/postgres-formula>`_

‎ssf/formulas.yaml

Lines changed: 116 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ ssf_node_anchors:
3131
- fedora
3232
- amazon
3333
provisioner:
34+
dependencies_epel: &dependencies_epel
35+
- name: 'epel'
36+
repo: 'git'
37+
source: 'https://github.com/saltstack-formulas/epel-formula.git'
3438
state_top_salt: &state_top_salt
3539
- '*':
3640
- .pkgrepo
@@ -92,34 +96,40 @@ ssf_node_anchors:
9296
# # [os , os_ver, salt_ver, py_ver]
9397
# - [ubuntu , 16.04, 2018.3, 2]
9498
# - [ubuntu , 16.04, 2017.7, 2]
95-
# platforms_os_fedora: &platforms_os_fedora
96-
# # [os , os_ver, salt_ver, py_ver]
97-
# - [fedora , 31 , master, 3]
98-
# - [fedora , 31 , 2019.2, 3]
99-
# - [fedora , 30 , 2018.3, 3]
100-
# - [fedora , 30 , 2017.7, 2]
99+
platforms_os_fedora: &platforms_os_fedora
100+
# [os , os_ver, salt_ver, py_ver]
101+
- [fedora , 31 , master, 3]
102+
- [fedora , 31 , 2019.2, 3]
103+
- [fedora , 30 , 2018.3, 3]
104+
- [fedora , 30 , 2017.7, 2]
101105
# platforms_os_suse: &platforms_os_suse
102106
# # [os , os_ver, salt_ver, py_ver]
103107
# - [opensuse/leap, 15.1 , master, 3]
104108
# - [opensuse/leap, 15.1 , 2019.2, 3]
105109
# - [opensuse/leap, 15.1 , 2018.3, 2]
106110
# - [opensuse/leap, 15.1 , 2017.7, 2]
107-
# platforms_os_centos: &platforms_os_centos
108-
# # [os , os_ver, salt_ver, py_ver]
109-
# - [centos , 8 , master, 3]
110-
# - [centos , 8 , 2019.2, 3]
111-
# - [centos , 7 , 2019.2, 2]
112-
# - [centos , 7 , 2018.3, 2]
113-
# - [centos , 6 , 2017.7, 2]
111+
platforms_os_centos: &platforms_os_centos
112+
# [os , os_ver, salt_ver, py_ver]
113+
- [centos , 8 , master, 3]
114+
- [centos , 8 , 2019.2, 3]
115+
- [centos , 7 , 2019.2, 2]
116+
- [centos , 7 , 2018.3, 2]
117+
- [centos , 6 , 2017.7, 2]
114118
platforms_os_centos6: &platforms_os_centos6
115119
# [os , os_ver, salt_ver, py_ver]
116120
- [centos , 6 , 2017.7, 2]
117-
# platforms_os_amazonlinux: &platforms_os_amazonlinux
118-
# # [os , os_ver, salt_ver, py_ver]
119-
# - [amazonlinux , 2 , master, 2]
120-
# - [amazonlinux , 2 , 2019.2, 2]
121-
# - [amazonlinux , 2 , 2018.3, 2]
122-
# - [amazonlinux , 2 , 2017.7, 2]
121+
platforms_os_amazonlinux: &platforms_os_amazonlinux
122+
# [os , os_ver, salt_ver, py_ver]
123+
- [amazonlinux , 2 , master, 2]
124+
- [amazonlinux , 2 , 2019.2, 2]
125+
- [amazonlinux , 2 , 2018.3, 2]
126+
- [amazonlinux , 2 , 2017.7, 2]
127+
platforms_os_arch_base: &platforms_os_arch_base
128+
# [os , os_ver, salt_ver, py_ver]
129+
- [arch-base , latest, master, 2]
130+
- [arch-base , latest, 2019.2, 2]
131+
- [arch-base , latest, 2018.3, 2]
132+
- [arch-base , latest, 2017.7, 2]
123133
platforms_os_redhat_locale_specific: &platforms_os_redhat_locale_specific
124134
# [os , os_ver, salt_ver, py_ver]
125135
- [centos , 8 , master, 3]
@@ -1298,6 +1308,93 @@ ssf:
12981308
additional:
12991309
- test/salt/pillar/default.sls
13001310
semrel_files: *semrel_files_default
1311+
# TODO:
1312+
# 1. test/salt/pillar/pillar.example.ubuntu.1604 -- not used?
1313+
packages:
1314+
context:
1315+
git:
1316+
github:
1317+
repo: 'packages-formula'
1318+
inspec_suites_kitchen:
1319+
0:
1320+
# None of the platforms use `default` directly
1321+
includes: *includes_NONE
1322+
inspec_yml:
1323+
summary: >-
1324+
Verify that the packages formula is setup and configured correctly
1325+
provisioner:
1326+
pillars_from_files: []
1327+
1:
1328+
includes: *platforms_os_debian
1329+
provisioner:
1330+
pillars_from_files:
1331+
- .sls: 'test/salt/pillar/debian.sls'
1332+
verifier: *verifier_inspec_tests_default
1333+
2:
1334+
includes: *platforms_os_ubuntu
1335+
provisioner:
1336+
pillars_from_files:
1337+
- .sls: 'test/salt/pillar/ubuntu1804.sls'
1338+
verifier: *verifier_inspec_tests_default
1339+
3:
1340+
includes: *platforms_os_fedora
1341+
provisioner:
1342+
pillars_from_files:
1343+
- .sls: 'test/salt/pillar/fedora.sls'
1344+
verifier: *verifier_inspec_tests_default
1345+
4:
1346+
includes: *platforms_os_centos
1347+
provisioner:
1348+
dependencies: *dependencies_epel
1349+
pillars_from_files:
1350+
- .sls: 'test/salt/pillar/redhat.sls'
1351+
state_top:
1352+
- '*':
1353+
- epel
1354+
- .
1355+
verifier: *verifier_inspec_tests_default
1356+
5:
1357+
includes: *platforms_os_amazonlinux
1358+
provisioner:
1359+
dependencies: *dependencies_epel
1360+
pillars_from_files:
1361+
- .sls: 'test/salt/pillar/amazon.sls'
1362+
state_top:
1363+
- '*':
1364+
- epel
1365+
- .
1366+
verifier: *verifier_inspec_tests_default
1367+
6:
1368+
includes: *platforms_osfamily_suse
1369+
provisioner:
1370+
pillars_from_files:
1371+
- .sls: 'test/salt/pillar/opensuse.sls'
1372+
verifier: *verifier_inspec_tests_default
1373+
7:
1374+
includes: *platforms_os_arch_base
1375+
provisioner:
1376+
pillars_from_files:
1377+
- .sls: 'test/salt/pillar/arch.sls'
1378+
verifier: *verifier_inspec_tests_default
1379+
inspec_suites_matrix:
1380+
- default
1381+
- debian
1382+
- ubuntu
1383+
- fedora
1384+
- centos
1385+
- amazon
1386+
- suse
1387+
- arch
1388+
platforms_matrix:
1389+
# [os , os_ver, salt_ver, py_ver, inspec_suite]
1390+
- [debian , 10 , master, 3, debian]
1391+
- [ubuntu , 18.04, 2019.2, 3, ubuntu]
1392+
- [opensuse/leap, 15.1 , 2019.2, 3, suse]
1393+
- [amazonlinux , 2 , 2019.2, 2, amazon]
1394+
- [fedora , 30 , 2018.3, 3, fedora]
1395+
- [centos , 7 , 2018.3, 2, centos]
1396+
- [arch-base , latest, 2017.7, 2, arch]
1397+
semrel_files: *semrel_files_default
13011398
php:
13021399
context:
13031400
git:

0 commit comments

Comments
 (0)