Skip to content

Commit

Permalink
Merge pull request #65 from myii/feat/merge-rubocop-linter-for-multip…
Browse files Browse the repository at this point in the history 
…le-formulas

feat(formulas): merge `rubocop` linter into main `lint` job
  • Loading branch information
@myii
myii authored Oct 12, 2019
2 parents e8afcc4 + 4e491e7 commit ab9d836
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 25 deletions.
2 changes: 1 addition & 1 deletion ssf/defaults.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ssf_node_anchors:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length
title: 'ci(travis): merge `rubocop` linter into main `lint` job'
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/64'
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/65'
# yamllint enable rule:line-length
github:
owner: saltstack-formulas
Expand Down
32 changes: 8 additions & 24 deletions ssf/formulas.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,6 @@ ssf:
- '*':
- .ng.server
platforms_matrix: *platforms_matrix_osfamily_debian
travis: *travis_do_not_use_single_job_for_linters
use_tofs: true
semrel_files:
<<: *semrel_files_default
Expand Down Expand Up @@ -351,7 +350,6 @@ ssf:
inspec_yml:
summary: >-
Verify that the chrony formula is setup and configured correctly
travis: *travis_do_not_use_single_job_for_linters
use_tofs: true
semrel_files: *semrel_files_default
collectd:
Expand All @@ -377,7 +375,6 @@ ssf:
- [fedora , 29 , 2018.3, 2, default]
- [opensuse/leap, 15 , 2018.3, 2, default]
- [centos , 6 , 2017.7, 2, default]
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
cron:
context:
Expand All @@ -393,7 +390,6 @@ ssf:
pillars_from_files:
- .sls: test/salt/pillar/cron.sls
platforms_matrix: *platforms_matrix_without_arch
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
deepsea:
context:
Expand Down Expand Up @@ -437,7 +433,6 @@ ssf:
# - [opensuse/leap, 15 , 2017.7, 2, default]
# # - [amazonlinux , 2 , 2017.7, 2, default]
# # - [arch-base , latest, 2017.7, 2, default]
travis: *travis_do_not_use_single_job_for_linters
use_tofs: true
semrel_files: *semrel_files_default
dhcpd:
Expand Down Expand Up @@ -481,7 +476,6 @@ ssf:
pillars_from_files:
- .sls: test/salt/pillar/exim.sls
platforms_matrix: *platforms_matrix_osfamily_debian
travis: *travis_do_not_use_single_job_for_linters
use_tofs: true
semrel_files: *semrel_files_default
fail2ban:
Expand Down Expand Up @@ -513,7 +507,6 @@ ssf:
# - [fedora , 29 , 2018.3, 2, default]
- [opensuse/leap, 15 , 2018.3, 2, default]
- [centos , 6 , 2017.7, 2, default]
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
golang:
context:
Expand Down Expand Up @@ -566,7 +559,6 @@ ssf:
pillars_from_files:
- .sls: test/salt/pillar/influxdb.sls
platforms_matrix: *platforms_matrix_without_arch
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
iptables:
context:
Expand Down Expand Up @@ -626,7 +618,6 @@ ssf:
pre:
- sudo modprobe ip_vs
travis:
<<: *travis_do_not_use_single_job_for_linters
addons:
apt:
packages:
Expand Down Expand Up @@ -719,7 +710,6 @@ ssf:
- [fedora , 29 , 2018.3, 2, fedora]
- [opensuse/leap, 15 , 2018.3, 2, default]
- [centos , 6 , 2017.7, 2, default]
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
logrotate:
context:
Expand All @@ -742,7 +732,6 @@ ssf:
- .
- .jobs
platforms_matrix: *platforms_matrix_without_arch
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
lvm:
context:
Expand Down Expand Up @@ -780,7 +769,6 @@ ssf:
# - [centos , 6 , 2017.7, 2, default]
- [amazonlinux , 2 , 2017.7, 2, default]
# # - [arch-base , latest, 2017.7, 2, default]
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
mysql:
context:
Expand All @@ -803,7 +791,6 @@ ssf:
- [ubuntu , 18.04, 2019.2, 3, default]
- [debian , 9 , 2018.3, 2, default]
- [debian , 8 , 2017.7, 2, default]
travis: *travis_do_not_use_single_job_for_linters
yamllint:
ignore:
additional:
Expand Down Expand Up @@ -979,7 +966,6 @@ ssf:
- '*':
- .
- .config
travis: *travis_do_not_use_single_job_for_linters
yamllint:
rules:
key-duplicates:
Expand Down Expand Up @@ -1058,7 +1044,6 @@ ssf:
- [debian , 9 , 2018.3, 2, default]
- [ubuntu , 16.04, 2018.3, 2, default]
- [centos , 6 , 2017.7, 2, default]
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
rkhunter:
context:
Expand Down Expand Up @@ -1376,7 +1361,6 @@ ssf:
- [debian , 9 , 2019.2, 3, default]
- [ubuntu , 18.04, 2019.2, 3, default]
- [debian , 9 , 2018.3, 2, default]
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
sudoers:
context:
Expand All @@ -1400,7 +1384,10 @@ ssf:
- '*':
- .
- .included
travis: *travis_do_not_use_single_job_for_linters
rubocop:
Cops:
Metrics/BlockLength:
Max: 41
semrel_files: *semrel_files_default
sysctl:
context:
Expand All @@ -1424,7 +1411,6 @@ ssf:
- [fedora , 29 , 2018.3, 2, default]
- [opensuse/leap, 15 , 2018.3, 2, default]
# - [centos , 6 , 2017.7, 2, default]
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
syslog-ng:
context:
Expand Down Expand Up @@ -1514,7 +1500,10 @@ ssf:
- [amazonlinux , 2 , 2017.7, 2]
- [arch-base , latest, 2017.7, 2]
platforms_matrix: *platforms_matrix_systemd_only
travis: *travis_do_not_use_single_job_for_linters
rubocop:
Cops:
Metrics/BlockLength:
Max: 41
use_tofs: true
semrel_files: *semrel_files_default
telegraf:
Expand All @@ -1538,7 +1527,6 @@ ssf:
- [fedora , 30 , 2019.2, 3, default]
- [opensuse/leap, 15 , 2018.3, 2, default]
- [ubuntu , 16.04, 2017.7, 2, default]
travis: *travis_do_not_use_single_job_for_linters
use_tofs: true
semrel_files: *semrel_files_default
template:
Expand Down Expand Up @@ -1608,7 +1596,6 @@ ssf:
provisioner:
pillars_from_files:
- .sls: test/salt/pillar/timezone.sls
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
ufw:
context:
Expand Down Expand Up @@ -1655,7 +1642,6 @@ ssf:
pillars_from_files:
- .sls: test/salt/pillar/default.sls
platforms_matrix: *platforms_matrix_without_arch
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
vault:
context:
Expand Down Expand Up @@ -1745,7 +1731,6 @@ ssf:
pillars_from_files:
- .sls: test/salt/pillar/vim.sls
platforms_matrix: *platforms_matrix_without_arch
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default
vsftpd:
context:
Expand All @@ -1760,5 +1745,4 @@ ssf:
provisioner:
pillars_from_files:
- .sls: test/salt/pillar/vsftpd.sls
travis: *travis_do_not_use_single_job_for_linters
semrel_files: *semrel_files_default

0 comments on commit ab9d836

Please sign in to comment.