1
0
Fork 0
mirror of synced 2024-06-18 21:01:08 -04:00

Merge pull request #63 from myii/ci/merge-rubocop-linter

ci(travis): merge `rubocop` linter into main `lint` job
This commit is contained in:
Imran Iqbal 2019-10-11 22:11:49 +01:00 committed by GitHub
commit 7a8851ea47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 19 deletions

View file

@ -8,3 +8,5 @@ Metrics/LineLength:
Max: 88
# Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
Metrics/BlockLength:
Max: 41

View file

@ -21,17 +21,14 @@ stages:
- name: release
if: branch = master AND type != pull_request
jobs:
allow_failures:
- env: Lint_rubocop
fast_finish: true
include:
## Define the test stage that runs the linters (and testing matrix, if applicable)
# Run all of the linters in a single job (except `rubocop`)
# Run all of the linters in a single job
- language: node_js
node_js: lts/*
env: Lint
name: 'Lint: salt-lint, yamllint & commitlint'
name: 'Lint: salt-lint, yamllint, rubocop & commitlint'
before_install: skip
script:
# Install and run `salt-lint`
@ -42,21 +39,13 @@ jobs:
# Need at least `v1.17.0` for the `yaml-files` setting
- pip install --user yamllint>=1.17.0
- yamllint -s .
# Install and run `rubocop`
- gem install rubocop
- rubocop -d
# Install and run `commitlint`
- npm install @commitlint/config-conventional -D
- npm install @commitlint/travis-cli -D
- commitlint-travis
# Run the `rubocop` linter in a separate job that is allowed to fail
# Once these lint errors are fixed, this can be merged into a single job
- language: node_js
node_js: lts/*
env: Lint_rubocop
name: 'Lint: rubocop'
before_install: skip
script:
# Install and run `rubocop`
- gem install rubocop
- rubocop -d
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with

View file

@ -1,3 +1,5 @@
# frozen_string_literal: true
control 'Sudoers configuration' do
title 'should match desired lines'
@ -8,7 +10,9 @@ control 'Sudoers configuration' do
its('mode') { should cmp '0440' }
its('content') { should include 'Defaults:ADMINS !lecture' }
its('content') { should include 'Defaults:johndoe !requiretty' }
its('content') { should include 'Defaults@www1 log_year, logfile=/var/log/sudo.log' }
its('content') do
should include 'Defaults@www1 log_year, logfile=/var/log/sudo.log'
end
its('content') { should include 'Host_Alias WEBSERVERS = www1,www2,www3' }
its('content') { should include 'User_Alias ADMINS = millert,dowdy,mikef' }
its('content') { should include 'johndoe ALL=(ALL) ALL' }
@ -17,7 +21,6 @@ control 'Sudoers configuration' do
its('content') { should include '%sudo ALL=(nodejs) NOPASSWD: ALL' }
its('content') { should include '+sysadmins ALL=(ALL) ALL' }
its('content') { should include '#includedir /etc/sudoers.d' }
end
describe file('/etc/sudoers.d/extra-file') do
@ -43,5 +46,4 @@ control 'Sudoers configuration' do
its('mode') { should cmp '0440' }
its('content') { should include '+other_netgroup ALL=(ALL) ALL' }
end
end

View file

@ -1,3 +1,4 @@
# frozen_string_literal: true
control 'Sudo package' do
title 'should be installed'