Skip to content

Commit 77a620b

Browse files
committed
1 parent 7ab8fa7 commit 77a620b

File tree

2 files changed

+27
-9
lines changed

2 files changed

+27
-9
lines changed

ssf/defaults.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ ssf_node_anchors:
6363
# `git describe --abbrev=0 --tags`
6464
# yamllint disable rule:line-length rule:quoted-strings
6565
title: "test(map): verify '`'map.jinja'`' dump using '`'_mapdata'`' state"
66-
body: '* Automated using https://github.com/myii/ssf-formula/pull/282'
66+
body: '* Automated using https://github.com/myii/ssf-formula/pull/283'
6767
# yamllint enable rule:line-length rule:quoted-strings
6868
github:
6969
owner: 'saltstack-formulas'
@@ -996,14 +996,17 @@ ssf:
996996
<<: *isk_default
997997
1:
998998
<<: *isk_suite_default
999-
name: 'debian'
999+
name: 'share'
10001000
2:
10011001
<<: *isk_suite_default
1002-
name: 'ubuntu'
1002+
name: 'debian'
10031003
3:
10041004
<<: *isk_suite_default
1005-
name: 'redhat'
1005+
name: 'ubuntu'
10061006
4:
1007+
<<: *isk_suite_default
1008+
name: 'redhat'
1009+
5:
10071010
<<: *isk_suite_default
10081011
name: 'suse'
10091012
postfix: *formula_default

ssf/formulas.yaml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3566,25 +3566,28 @@ ssf:
35663566
# None of the platforms use `default` directly
35673567
includes: *includes_NONE
35683568
inspec_yml:
3569+
depends: *depends_on_suite_share
35693570
summary: >-
35703571
Verify that the php formula is setup and configured correctly
35713572
provisioner:
35723573
pillars_from_files: []
3573-
1:
3574+
1: *inspec_suites_kitchen__share_suite
3575+
2:
35743576
includes: *platforms_os_debian
35753577
provisioner:
35763578
pillars_from_files:
35773579
- .sls: 'test/salt/pillar/debian.sls'
35783580
state_top:
35793581
- '*':
3582+
- ._mapdata
35803583
- .repo
35813584
- .fpm.install
35823585
- .fpm.config
35833586
- .fpm.pools
35843587
- .modules
35853588
- .fpm.service
35863589
verifier: *verifier_inspec_tests_default
3587-
2:
3590+
3:
35883591
includes: *platforms_os_ubuntu
35893592
provisioner:
35903593
pillars:
@@ -3596,31 +3599,43 @@ ssf:
35963599
- ubuntu.sls: 'test/salt/pillar/ubuntu.sls'
35973600
state_top:
35983601
- '*':
3602+
- ._mapdata
35993603
- .repo
36003604
- .fpm.install
36013605
- .fpm.config
36023606
- .fpm.pools
36033607
- .modules
36043608
- .fpm.service
36053609
verifier: *verifier_inspec_tests_default
3606-
3:
3610+
4:
36073611
includes: *platforms_osfamily_redhat
36083612
provisioner:
36093613
pillars_from_files:
36103614
- .sls: 'test/salt/pillar/redhat.sls'
3615+
state_top:
3616+
- '*':
3617+
- ._mapdata
3618+
- .
36113619
verifier: *verifier_inspec_tests_default
3612-
4:
3620+
5:
36133621
includes: *platforms_osfamily_suse
36143622
provisioner:
36153623
pillars_from_files:
36163624
- .sls: 'test/salt/pillar/suse.sls'
3625+
state_top:
3626+
- '*':
3627+
- ._mapdata
3628+
- .
36173629
verifier: *verifier_inspec_tests_default
36183630
inspec_suites_matrix:
36193631
- default
36203632
- debian
36213633
- ubuntu
36223634
- redhat
36233635
- suse
3636+
map_jinja:
3637+
verification:
3638+
import: 'php'
36243639
platforms_matrix:
36253640
- [debian , 10 , master, 3, debian]
36263641
- [ubuntu , 18.04, 2019.2, 3, ubuntu]
@@ -3630,7 +3645,7 @@ ssf:
36303645
# # - [centos , 6 , 2017.7, 2, redhat]
36313646
travis: *travis_do_not_use_single_job_for_linters
36323647
use_tofs: true
3633-
semrel_files: *semrel_files_default
3648+
semrel_files: *semrel_files_inc_map_jinja_verifier
36343649
postfix:
36353650
context:
36363651
codeowners:

0 commit comments

Comments
 (0)