Skip to content

Commit a0fdc92

Browse files
myiimyii
authored
Merge pull request #261 from myii/feat/capture-recent-changes-across-formulas
feat(formulas): capture recent changes across formulas
2 parents c259684 + f0c9018 commit a0fdc92

File tree

3 files changed

+97
-9
lines changed

3 files changed

+97
-9
lines changed

‎ssf/config/formulas.sls‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ prepare-git-branch-for-{{ formula }}:
8686
{%- endif %}
8787
{%- endif %}
8888
{%- set dest = '{0}/{1}/{2}'.format(ssf.formulas_path, formula, dest_file) %}
89+
{#- Take advantage of `dest_file_done` to avoid managing/removing legacy TOFS files #}
90+
{%- if (semrel_file in ['docs/TOFS_pattern.rst', 'formula/libtofs.jinja'] and use_tofs == 'legacy') %}
91+
{%- do dest_file_done.append(dest_file) %}
92+
{%- endif %}
8993
{#- Only run the states for each suite if the same template is being used for each file (in each suite) #}
9094
{#- Furthermore, only continue if the `dest_file` has actually been set #}
9195
{%- if dest_file and dest_file not in dest_file_done %}

‎ssf/defaults.yaml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ ssf_node_anchors:
5555
# An alternative method could be to use:
5656
# `git describe --abbrev=0 --tags`
5757
# yamllint disable rule:line-length rule:quoted-strings
58-
title: "chore: standardise structure"
59-
body: '* Checked using https://github.com/myii/ssf-formula/pull/260'
58+
title: "chore: standardise structure [skip ci]"
59+
body: '* Automated using https://github.com/myii/ssf-formula/pull/261'
6060
# yamllint enable rule:line-length rule:quoted-strings
6161
github:
6262
owner: 'saltstack-formulas'
@@ -807,7 +807,15 @@ ssf:
807807
3:
808808
<<: *isk_suite_default
809809
name: 'amazonlinux'
810-
prometheus: *formula_default
810+
prometheus:
811+
<<: *formula_default
812+
context:
813+
<<: *context_default
814+
inspec_suites_kitchen:
815+
<<: *isk_default
816+
1:
817+
<<: *isk_suite_default
818+
name: 'repo'
811819
rabbitmq:
812820
<<: *formula_default
813821
context:

‎ssf/formulas.yaml‎

Lines changed: 82 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ ssf:
693693
# - [ubuntu , 16.04, 2017.7, 2]
694694
platforms_matrix:
695695
# [os , os_ver, salt_ver, py_ver, inspec_suite]
696-
- [debian , 10 , master, 3, '']
696+
- [debian , 10 , master, 3, repositories]
697697
- [ubuntu , 18.04, master, 3, repositories]
698698
- [debian , 9 , 2019.2, 3, preferences]
699699
- [ubuntu , 18.04, 2019.2, 3, unattended]
@@ -3529,17 +3529,93 @@ ssf:
35293529
semrel_files: *semrel_files_default
35303530
prometheus:
35313531
context:
3532+
codeowners:
3533+
entries:
3534+
global:
3535+
- '*':
3536+
- '@alxwr'
3537+
- '@noelmcloughlin'
35323538
git:
35333539
github:
35343540
repo: 'prometheus-formula'
35353541
inspec_suites_kitchen:
35363542
0:
3543+
excludes: &platforms_os_centos_6_2018_3
3544+
- [centos , 6 , 2018.3, 2]
35373545
inspec_yml:
35383546
summary: >-
35393547
Verify that the prometheus formula is setup and configured correctly
3540-
platforms_matrix: *platforms_matrix_osfamily_debian
3541-
travis: *travis_do_not_use_single_job_for_linters
3548+
provisioner:
3549+
pillars_from_files:
3550+
- .sls: 'test/salt/pillar/default.sls'
3551+
1:
3552+
excludes: *platforms_os_centos_6_2018_3
3553+
inspec_yml:
3554+
summary: >-
3555+
Verify that the prometheus formula is setup and configured correctly
3556+
provisioner:
3557+
pillars_from_files:
3558+
- .sls: 'test/salt/pillar/repo.sls'
3559+
inspec_suites_matrix:
3560+
- default
3561+
- repo
3562+
platforms: *platforms_new
3563+
platforms_matrix:
3564+
# [os , os_ver, salt_ver, py_ver, inspec_suite]
3565+
- [debian , 10 , master, 3, default]
3566+
- [ubuntu , 20.04, master, 3, default]
3567+
- [centos , 8 , master, 3, default]
3568+
- [fedora , 32 , master, 3, default]
3569+
- [debian , 10 , 3000.3, 3, repo]
3570+
- [debian , 9 , 3000.3, 3, default]
3571+
# - [ubuntu , 18.04, 3000.3, 3, default]
3572+
- [centos , 7 , 3000.3, 3, repo]
3573+
- [opensuse/leap, 15.2 , 3000.3, 3, default]
3574+
- [amazonlinux , 2 , 3000.3, 3, default]
3575+
# - [fedora , 31 , 2019.2, 3, default]
3576+
- [arch-base , latest, 2019.2, 2, default]
3577+
# To deal with excessive instances when mimicking `kitchen list -b`
3578+
# If values are set, only use these as commented entries in the matrix
3579+
platforms_matrix_commented_includes:
3580+
# [os , os_ver, salt_ver, py_ver, inspec_suite]
3581+
- [debian , 10 , master, 3, default]
3582+
- [ubuntu , 20.04, master, 3, default]
3583+
- [ubuntu , 18.04, master, 3, default]
3584+
- [centos , 8 , master, 3, default]
3585+
- [fedora , 32 , master, 3, default]
3586+
- [fedora , 31 , master, 3, default]
3587+
- [opensuse/leap, 15.2 , master, 3, default]
3588+
- [amazonlinux , 2 , master, 3, default]
3589+
- [debian , 10 , 3000.3, 3, default]
3590+
- [debian , 9 , 3000.3, 3, default]
3591+
- [ubuntu , 18.04, 3000.3, 3, default]
3592+
- [centos , 8 , 3000.3, 3, default]
3593+
- [centos , 7 , 3000.3, 3, default]
3594+
- [fedora , 31 , 3000.3, 3, default]
3595+
- [opensuse/leap, 15.2 , 3000.3, 3, default]
3596+
- [amazonlinux , 2 , 3000.3, 3, default]
3597+
- [ubuntu , 18.04, 3000.3, 2, default]
3598+
- [ubuntu , 16.04, 3000.3, 2, default]
3599+
- [arch-base , latest, 3000.3, 2, default]
3600+
- [debian , 10 , 2019.2, 3, default]
3601+
- [debian , 9 , 2019.2, 3, default]
3602+
- [ubuntu , 18.04, 2019.2, 3, default]
3603+
- [ubuntu , 16.04, 2019.2, 3, default]
3604+
- [centos , 8 , 2019.2, 3, default]
3605+
- [centos , 7 , 2019.2, 3, default]
3606+
- [fedora , 31 , 2019.2, 3, default]
3607+
- [opensuse/leap, 15.2 , 2019.2, 3, default]
3608+
- [amazonlinux , 2 , 2019.2, 3, default]
3609+
- [centos , 6 , 2019.2, 2, default]
3610+
- [amazonlinux , 1 , 2019.2, 2, default]
3611+
- [arch-base , latest, 2019.2, 2, default]
3612+
- [debian , 10 , 3000.3, 3, repo]
3613+
- [centos , 7 , 3000.3, 3, repo]
35423614
use_tofs: true
3615+
yamllint:
3616+
ignore:
3617+
additional:
3618+
- prometheus/osfamilymap.yaml
35433619
semrel_files: *semrel_files_default
35443620
rabbitmq:
35453621
context:
@@ -4788,9 +4864,9 @@ ssf:
47884864
- [amazonlinux , 2 , 3000.3, 3, default]
47894865
- [fedora , 31 , 2019.2, 3, default]
47904866
- [arch-base , latest, 2019.2, 2, default]
4791-
# # Enable this in a subsequent PR, since it's an old version,
4792-
# # which is already active (needs to be checked for regressions)
4793-
# use_tofs: true
4867+
# TODO: Upgrade to latest TOFS in a subsequent PR, since a legacy version
4868+
# is active for the time being (needs to be checked for regressions)
4869+
use_tofs: legacy
47944870
semrel_files: *semrel_files_default
47954871
vault:
47964872
context:

0 commit comments

Comments
 (0)