Merge pull request #56 from myii/chore/standardise-structure

feat(yamllint): include for this repo and apply rules throughout
This commit is contained in:
Niels Abspoel 2019-08-17 09:51:30 +02:00 committed by GitHub
commit ced602e4a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 7 deletions

View File

@ -3,7 +3,7 @@
--- ---
stages: stages:
- test - test
- commitlint - lint
- name: release - name: release
if: branch = master AND type != pull_request if: branch = master AND type != pull_request
@ -45,16 +45,21 @@ script:
jobs: jobs:
include: include:
# Define the commitlint stage # Define the `lint` stage (runs `yamllint` and `commitlint`)
- stage: commitlint - stage: lint
language: node_js language: node_js
node_js: lts/* node_js: lts/*
before_install: skip before_install: skip
script: script:
# Install and run `yamllint`
- pip install --user yamllint
# yamllint disable-line rule:line-length
- yamllint -s . .yamllint pillar.example test/salt/pillar/kitchen.sls test/salt/pillar/default.sls
# Install and run `commitlint`
- npm install @commitlint/config-conventional -D - npm install @commitlint/config-conventional -D
- npm install @commitlint/travis-cli -D - npm install @commitlint/travis-cli -D
- commitlint-travis - commitlint-travis
# Define the release stage that runs semantic-release # Define the release stage that runs `semantic-release`
- stage: release - stage: release
language: node_js language: node_js
node_js: lts/* node_js: lts/*

16
.yamllint Normal file
View File

@ -0,0 +1,16 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
# Extend the `default` configuration provided by `yamllint`
extends: default
# Files to ignore completely
# 1. All YAML files under directory `node_modules/`, introduced during the Travis run
ignore: |
node_modules/
rules:
line-length:
# Increase from default of `80`
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
max: 88

View File

@ -3,7 +3,7 @@
--- ---
sudoers: sudoers:
# By default the main sudoers file is managed by this formula (False to skip) # By default the main sudoers file is managed by this formula (False to skip)
manage_main_config: True manage_main_config: true
users: users:
johndoe: johndoe:
- 'ALL=(ALL) ALL' - 'ALL=(ALL) ALL'

View File

@ -1,3 +1,6 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
name: default name: default
title: sudoers formula title: sudoers formula
maintainer: SaltStack Formulas maintainer: SaltStack Formulas

View File

@ -1,6 +1,9 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
sudoers: sudoers:
# By default the main sudoers file is managed by this formula (False to skip) # By default the main sudoers file is managed by this formula (False to skip)
manage_main_config: True manage_main_config: true
users: users:
johndoe: johndoe:
- 'ALL=(ALL) ALL' - 'ALL=(ALL) ALL'

View File

@ -1,7 +1,9 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
# Pillar needed to run Inspec inside Docker image using sudo to authenticate # Pillar needed to run Inspec inside Docker image using sudo to authenticate
# Must be added to pillar of all test suites # Must be added to pillar of all test suites
sudoers: sudoers:
users: users:
kitchen: kitchen:
- 'ALL=(root) NOPASSWD: ALL' - 'ALL=(root) NOPASSWD: ALL'