From 482cfce47946d4ea23fc4e654e471e2621b758e5 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 20:24:10 +0100 Subject: [PATCH 01/25] feat(salt): merge `rubocop` linter into main `lint` job --- ssf/defaults.yaml | 2 +- ssf/formulas.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml index f5cb6858..faa32fd3 100644 --- a/ssf/defaults.yaml +++ b/ssf/defaults.yaml @@ -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 diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 4957cc72..69ca7bb0 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1265,7 +1265,6 @@ ssf: # - [centos , 7 , 2019.2, 3, v201902-py3] - [fedora , 30 , 2019.2, 3, v201902-py3] - [opensuse/leap, 15 , 2019.2, 3, v201902-py3] - travis: *travis_do_not_use_single_job_for_linters use_tofs: true yamllint: ignore: From 923acd6eec2212651ba84bf39e230563d5669e3b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 21:00:02 +0100 Subject: [PATCH 02/25] feat(mysql): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 69ca7bb0..5574b19b 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -803,7 +803,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: @@ -1265,6 +1264,7 @@ ssf: # - [centos , 7 , 2019.2, 3, v201902-py3] - [fedora , 30 , 2019.2, 3, v201902-py3] - [opensuse/leap, 15 , 2019.2, 3, v201902-py3] + travis: *travis_do_not_use_single_job_for_linters use_tofs: true yamllint: ignore: From 6e4cb642ae1cbc5892203348270cec1afe32df16 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 21:05:49 +0100 Subject: [PATCH 03/25] feat(users): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 5574b19b..1f2723fb 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1654,7 +1654,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: From 2346b380ae8507d5624c666343f77d568260c85b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 21:23:42 +0100 Subject: [PATCH 04/25] feat(redis): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 1f2723fb..ba05a361 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1057,7 +1057,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: From 7f0c48d18a840c43782a00bc1f96addebf452b15 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 22:08:47 +0100 Subject: [PATCH 05/25] feat(sudoers): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index ba05a361..340cce58 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1398,7 +1398,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: From f38ef8dd5674dd2a70028b279b6877c8847ca922 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 22:09:09 +0100 Subject: [PATCH 06/25] feat(postfix): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 340cce58..af87ba2e 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -978,7 +978,6 @@ ssf: - '*': - . - .config - travis: *travis_do_not_use_single_job_for_linters yamllint: rules: key-duplicates: From 717eac458283c63185a3dd4d2b9bfc82e8af9c65 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 22:15:23 +0100 Subject: [PATCH 07/25] feat(vim): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index af87ba2e..44b42f18 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1744,7 +1744,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: From 9ba1a3fb200564ccf054d5230d8917e8b4d55570 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 22:25:18 +0100 Subject: [PATCH 08/25] feat(collectd): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 44b42f18..c8b9b68d 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -377,7 +377,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: From 9348835ae43166010cdbdb24196d01a31759648d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 22:35:36 +0100 Subject: [PATCH 09/25] feat(fail2ban): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index c8b9b68d..05be212c 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -512,7 +512,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: From 02074880c8d3fcfc048ab68ff1156a1dda63a3a3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 22:51:35 +0100 Subject: [PATCH 10/25] feat(logrotate): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 05be212c..39eea457 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -740,7 +740,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: From d6bffd07659995935519ecf432d8b64ad83b9783 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 01:03:17 +0100 Subject: [PATCH 11/25] feat(sysctl): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 39eea457..8d583f01 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1421,7 +1421,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: From a799f8b225cb6309f03a5cce400bfba32dff20ec Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 01:07:55 +0100 Subject: [PATCH 12/25] feat(apt-cacher): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 8d583f01..3c4fb30e 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -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 From ad03ed97f25c14e301574122ce9d2c61dc50fb11 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 01:12:59 +0100 Subject: [PATCH 13/25] feat(systemd): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 3c4fb30e..22d6a166 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1509,7 +1509,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: From 44c8c7fcf38b16253591de199dafdf8f1b0f52ac Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 01:16:39 +0100 Subject: [PATCH 14/25] feat(timezone): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 22d6a166..d35f35ca 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1606,7 +1606,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: From 7ab18a1976050f441829b10563ff8b6f4aa596bd Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 01:20:50 +0100 Subject: [PATCH 15/25] feat(keepalived): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index d35f35ca..11c217dd 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -623,7 +623,6 @@ ssf: pre: - sudo modprobe ip_vs travis: - <<: *travis_do_not_use_single_job_for_linters addons: apt: packages: From b9bceb49fe72883a17b63647b33821337dc1721b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 01:24:38 +0100 Subject: [PATCH 16/25] feat(chrony): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 11c217dd..e14d7e1f 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -350,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: From 731776e3958fc8924e9da1e42a9944948fab3301 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 01:31:13 +0100 Subject: [PATCH 17/25] feat(stunnel): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index e14d7e1f..9db7d3c9 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1367,7 +1367,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: From 5ea95582bda7d098e2564fcb1d81f2b2a20de7c2 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 01:36:22 +0100 Subject: [PATCH 18/25] feat(lvm): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 9db7d3c9..e935aabc 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -774,7 +774,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: From 5c9fe9aa19155ab8c617455bf75afa67ca432768 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 01:40:20 +0100 Subject: [PATCH 19/25] feat(vsftpd): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index e935aabc..99b2e872 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1751,5 +1751,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 From 3094eff73193bf5b7cb55bf6f2af3e04d3d55290 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 06:22:51 +0100 Subject: [PATCH 20/25] feat(exim): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 99b2e872..dad4c4db 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -478,7 +478,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: From 5f6af1e3e8f928cee4e526f7490eab577b434c7d Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 06:39:35 +0100 Subject: [PATCH 21/25] feat(deepsea): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index dad4c4db..b277778e 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -434,7 +434,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: From 187ccf44689c20aaf5ff63b487e065d25a402510 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 06:46:48 +0100 Subject: [PATCH 22/25] feat(cron): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index b277778e..58bd7f10 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -390,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: From 1226b015bbe994a05abfe612ccd484a08eb4d634 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 06:55:58 +0100 Subject: [PATCH 23/25] feat(influxdb): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 58bd7f10..88f17ea0 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -559,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: From 74ab8f854025f34d059403f1fdc6af8679d36ec4 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 07:46:53 +0100 Subject: [PATCH 24/25] feat(locale): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index 88f17ea0..bbbe8c3f 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -710,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: From 4e491e786a3d6a5f59d4ab6d4ea5bdc12b9d8dda Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 12 Oct 2019 08:03:44 +0100 Subject: [PATCH 25/25] feat(telegraf): merge `rubocop` linter into main `lint` job --- ssf/formulas.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml index bbbe8c3f..d867e3cd 100644 --- a/ssf/formulas.yaml +++ b/ssf/formulas.yaml @@ -1527,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: