Skip to content

Commit bad1d73

Browse files
authored
Merge pull request #54 from myii/feat/use-TOFS-for-apt-cacher-formula
feat(apt-cacher): implement TOFS
2 parents 77d4587 + e79a418 commit bad1d73

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

ssf/config/formulas.sls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ prepare-git-branch-for-{{ formula }}:
5353
{#- Replace 'formula/' with the actual name of the formula #}
5454
{%- set dest_file = '{0}/{1}'.format(
5555
semrel_file_specs.alt_semrel_formula | d(semrel_formula),
56-
dest_file.split('/')[-1],
56+
dest_file.split('/', 1)[1],
5757
) %}
5858
{%- elif dest_file.startswith('inspec/') %}
5959
{%- set inspec_tests_path_prefix = suite.verifier.inspec_tests_path_prefix %}

ssf/defaults.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ssf_node_anchors:
1717
# An alternative method could be to use:
1818
# `git describe --abbrev=0 --tags`
1919
# yamllint disable rule:line-length
20-
title: 'chore(yamllint): update ignored paths and add `octal-values` [skip ci]'
21-
body: '* Automated using https://github.com/myii/ssf-formula/pull/59'
20+
title: 'feat(tofs): implementation for all file.managed'
21+
body: '* Checked using https://github.com/myii/ssf-formula/pull/54'
2222
# yamllint enable rule:line-length
2323
github:
2424
owner: saltstack-formulas

ssf/formulas.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,12 @@ ssf:
275275
- '*':
276276
- .ng.server
277277
platforms_matrix: *platforms_matrix_osfamily_debian
278-
semrel_files: *semrel_files_default
278+
use_tofs: true
279+
semrel_files:
280+
<<: *semrel_files_default
281+
formula/libtofs.jinja:
282+
<<: *file__formula__libtofs--jinja
283+
dest_file: formula/ng/libtofs.jinja
279284
bind:
280285
context:
281286
git:
@@ -503,7 +508,6 @@ ssf:
503508
inspec_yml:
504509
summary: >-
505510
Verify that the golang formula is setup and configured correctly
506-
use_tofs: true
507511
platforms_matrix:
508512
# [os , os_ver, salt_ver, py_ver, inspec_suite]
509513
- [debian , 10 , develop, 3, default]
@@ -514,6 +518,7 @@ ssf:
514518
- [fedora , 29 , 2018.3, 2, default]
515519
# - [opensuse/leap, 15 , 2018.3, 2, default]
516520
- [centos , 6 , 2017.7, 2, default]
521+
use_tofs: true
517522
semrel_files: *semrel_files_default
518523
grafana:
519524
context:

0 commit comments

Comments
 (0)