Merge pull request #439 from myii/ci/merge-matrix-and-add-salt-lint-and-rubocop
ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job
This commit is contained in:
Imran Iqbal
GitHub
commit
59c589474d
10
.rubocop.yml
Normal file
10
.rubocop.yml
Normal file
@ -0,0 +1,10 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
# General overrides used across formulas in the org
|
||||
Metrics/LineLength:
|
||||
# Increase from default of `80`
|
||||
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
|
||||
Max: 88
|
||||
|
||||
# Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
|
||||
13
.salt-lint
Normal file
13
.salt-lint
Normal file
@ -0,0 +1,13 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
exclude_paths: []
|
||||
skip_list:
|
||||
# Using `salt-lint` for linting other files as well, such as Jinja macros/templates
|
||||
- 205 # Use ".sls" as a Salt State file extension
|
||||
# Skipping `207` and `208` because `210` is sufficient, at least for the time-being
|
||||
# I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
|
||||
- 207 # File modes should always be encapsulated in quotation marks
|
||||
- 208 # File modes should always contain a leading zero
|
||||
tags: []
|
||||
verbosity: 1
|
||||
113
.travis.yml
113
.travis.yml
@ -1,62 +1,43 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
## Machine config
|
||||
dist: bionic
|
||||
stages:
|
||||
- test
|
||||
- lint
|
||||
- name: release
|
||||
if: branch = master AND type != pull_request
|
||||
|
||||
sudo: required
|
||||
cache: bundler
|
||||
language: ruby
|
||||
|
||||
services:
|
||||
- docker
|
||||
|
||||
# Make sure the instances listed below match up with
|
||||
# the `platforms` defined in `kitchen.yml`
|
||||
env:
|
||||
matrix:
|
||||
# The ordering used below has been selected based on the time required in Travis
|
||||
# The slower ones are kept as high up as possible, to run concurrently rather than
|
||||
# slow down the entire run at the end (i.e. `centos-6` and `opensuse`)
|
||||
# However, the groupings needed to be maintained in some semblance of order
|
||||
# so this is a best-effort matrix, in the circumstances
|
||||
# - INSTANCE: v201707-py2-debian-8-2017-7-py2
|
||||
- INSTANCE: v201707-py2-ubuntu-1604-2017-7-py2
|
||||
- INSTANCE: v201707-py2-centos-6-2017-7-py2
|
||||
# - INSTANCE: v201707-py2-amazonlinux-2-2017-7-py2
|
||||
# - INSTANCE: v201707-py2-arch-base-latest-2017-7-py2
|
||||
# - INSTANCE: v201803-py2-debian-9-2018-3-py2
|
||||
# - INSTANCE: v201803-py2-ubuntu-1604-2018-3-py2
|
||||
- INSTANCE: v201803-py2-centos-7-2018-3-py2
|
||||
- INSTANCE: v201803-py2-amazonlinux-2-2018-3-py2
|
||||
# - INSTANCE: v201803-py2-arch-base-latest-2018-3-py2
|
||||
- INSTANCE: v201902-py2-debian-9-2019-2-py2
|
||||
- INSTANCE: v201902-py2-ubuntu-1804-2019-2-py2
|
||||
# - INSTANCE: v201902-py2-centos-7-2019-2-py2
|
||||
# - INSTANCE: v201902-py2-opensuse-leap-15-2019-2-py2
|
||||
# - INSTANCE: v201902-py2-amazonlinux-2-2019-2-py2
|
||||
# - INSTANCE: v201902-py2-arch-base-latest-2019-2-py2
|
||||
# - INSTANCE: v201902-py3-debian-9-2019-2-py3
|
||||
# - INSTANCE: v201902-py3-ubuntu-1804-2019-2-py3
|
||||
# - INSTANCE: v201902-py3-centos-7-2019-2-py3
|
||||
- INSTANCE: v201902-py3-fedora-30-2019-2-py3
|
||||
- INSTANCE: v201902-py3-opensuse-leap-15-2019-2-py3
|
||||
## Language and cache config
|
||||
language: ruby
|
||||
cache: bundler
|
||||
|
||||
## Script to run for the test stage
|
||||
script:
|
||||
- bin/kitchen verify ${INSTANCE}
|
||||
- bin/kitchen verify "${INSTANCE}"
|
||||
|
||||
## Stages and jobs matrix
|
||||
stages:
|
||||
- test
|
||||
- name: release
|
||||
if: branch = master AND type != pull_request
|
||||
jobs:
|
||||
allow_failures:
|
||||
- env: Lint_rubocop
|
||||
fast_finish: true
|
||||
include:
|
||||
# Define the `lint` stage (runs `yamllint` and `commitlint`)
|
||||
- stage: lint
|
||||
language: node_js
|
||||
## Define the test stage that runs the linters (and testing matrix, if applicable)
|
||||
|
||||
# Run all of the linters in a single job (except `rubocop`)
|
||||
- language: node_js
|
||||
node_js: lts/*
|
||||
env: Lint
|
||||
name: 'Lint: salt-lint, yamllint & commitlint'
|
||||
before_install: skip
|
||||
script:
|
||||
# Install and run `salt-lint`
|
||||
- pip install --user salt-lint
|
||||
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
|
||||
| xargs -I {} salt-lint {}
|
||||
# Install and run `yamllint`
|
||||
# Need at least `v1.17.0` for the `yaml-files` setting
|
||||
- pip install --user yamllint>=1.17.0
|
||||
@ -65,10 +46,54 @@ jobs:
|
||||
- npm install @commitlint/config-conventional -D
|
||||
- npm install @commitlint/travis-cli -D
|
||||
- commitlint-travis
|
||||
# Define the release stage that runs `semantic-release`
|
||||
# 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
|
||||
# the `platforms` defined in `kitchen.yml`
|
||||
# The ordering used below has been selected based on the time required in Travis
|
||||
# The slower ones are kept as high up as possible, to run concurrently rather than
|
||||
# slow down the entire run at the end (i.e. `centos-6` and `opensuse`)
|
||||
# However, the groupings needed to be maintained in some semblance of order
|
||||
# so this is a best-effort matrix, in the circumstances
|
||||
# - env: INSTANCE=v201707-py2-debian-8-2017-7-py2
|
||||
- env: INSTANCE=v201707-py2-ubuntu-1604-2017-7-py2
|
||||
- env: INSTANCE=v201707-py2-centos-6-2017-7-py2
|
||||
# - env: INSTANCE=v201707-py2-amazonlinux-2-2017-7-py2
|
||||
# - env: INSTANCE=v201707-py2-arch-base-latest-2017-7-py2
|
||||
# - env: INSTANCE=v201803-py2-debian-9-2018-3-py2
|
||||
# - env: INSTANCE=v201803-py2-ubuntu-1604-2018-3-py2
|
||||
- env: INSTANCE=v201803-py2-centos-7-2018-3-py2
|
||||
- env: INSTANCE=v201803-py2-amazonlinux-2-2018-3-py2
|
||||
# - env: INSTANCE=v201803-py2-arch-base-latest-2018-3-py2
|
||||
- env: INSTANCE=v201902-py2-debian-9-2019-2-py2
|
||||
- env: INSTANCE=v201902-py2-ubuntu-1804-2019-2-py2
|
||||
# - env: INSTANCE=v201902-py2-centos-7-2019-2-py2
|
||||
# - env: INSTANCE=v201902-py2-opensuse-leap-15-2019-2-py2
|
||||
# - env: INSTANCE=v201902-py2-amazonlinux-2-2019-2-py2
|
||||
# - env: INSTANCE=v201902-py2-arch-base-latest-2019-2-py2
|
||||
# - env: INSTANCE=v201902-py3-debian-9-2019-2-py3
|
||||
# - env: INSTANCE=v201902-py3-ubuntu-1804-2019-2-py3
|
||||
# - env: INSTANCE=v201902-py3-centos-7-2019-2-py3
|
||||
- env: INSTANCE=v201902-py3-fedora-30-2019-2-py3
|
||||
- env: INSTANCE=v201902-py3-opensuse-leap-15-2019-2-py3
|
||||
|
||||
## Define the release stage that runs `semantic-release`
|
||||
- stage: release
|
||||
language: node_js
|
||||
node_js: lts/*
|
||||
env: Release
|
||||
name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
|
||||
before_install: skip
|
||||
script:
|
||||
# Update `AUTHORS.md`
|
||||
|
||||
@ -20,6 +20,7 @@ yaml-files:
|
||||
# Default settings
|
||||
- '*.yaml'
|
||||
- '*.yml'
|
||||
- .salt-lint
|
||||
- .yamllint
|
||||
# SaltStack Formulas additional settings
|
||||
- '*.example'
|
||||
|
||||
7
Gemfile
7
Gemfile
@ -1,6 +1,7 @@
|
||||
source "https://rubygems.org"
|
||||
# frozen_string_literal: true
|
||||
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'kitchen-docker', '>= 2.9'
|
||||
gem 'kitchen-salt', '>= 0.6.0'
|
||||
gem 'kitchen-inspec', '>= 1.1'
|
||||
|
||||
gem 'kitchen-salt', '>= 0.6.0'
|
||||
|
||||
19
bin/kitchen
19
bin/kitchen
@ -8,22 +8,25 @@
|
||||
# this file is here to facilitate running it.
|
||||
#
|
||||
|
||||
require "pathname"
|
||||
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
|
||||
require 'pathname'
|
||||
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
|
||||
Pathname.new(__FILE__).realpath)
|
||||
|
||||
bundle_binstub = File.expand_path("../bundle", __FILE__)
|
||||
bundle_binstub = File.expand_path('bundle', __dir__)
|
||||
|
||||
if File.file?(bundle_binstub)
|
||||
if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
|
||||
load(bundle_binstub)
|
||||
else
|
||||
abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
|
||||
Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
|
||||
abort(
|
||||
'Your `bin/bundle` was not generated by Bundler, '\
|
||||
'so this binstub cannot run. Replace `bin/bundle` by running '\
|
||||
'`bundle binstubs bundler --force`, then run this command again.'
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
require "rubygems"
|
||||
require "bundler/setup"
|
||||
require 'rubygems'
|
||||
require 'bundler/setup'
|
||||
|
||||
load Gem.bin_path("test-kitchen", "kitchen")
|
||||
load Gem.bin_path('test-kitchen', 'kitchen')
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=jinja
|
||||
|
||||
{## Start imports ##}
|
||||
{#- Start imports #}
|
||||
{% import_yaml "salt/defaults.yaml" as defaults %}
|
||||
{% import_yaml "salt/osfamilymap.yaml" as osfamilymap %}
|
||||
{% import_yaml "salt/osmap.yaml" as osmap %}
|
||||
@ -18,8 +18,8 @@
|
||||
{% set lookup = salt['pillar.get']('salt:lookup', default={}, merge=True) %}
|
||||
{% do salt['defaults.merge'](defaults['salt'], lookup) %}
|
||||
|
||||
{## Merge in salt pillar ##}
|
||||
{#- Merge in salt pillar #}
|
||||
{% set salt_settings = salt['pillar.get']('salt', default=defaults['salt'], merge=True) %}
|
||||
|
||||
{## Merge in salt_formulas pillar ##}
|
||||
{#- Merge in salt_formulas pillar #}
|
||||
{% set formulas_settings = salt['pillar.get']('salt_formulas',default=defaults['salt_formulas'], merge=True) %}
|
||||
|
||||
@ -17,7 +17,7 @@ download-salt-minion:
|
||||
{% endif %}
|
||||
- user: root
|
||||
- group: wheel
|
||||
- mode: 0644
|
||||
- mode: '0644'
|
||||
- unless:
|
||||
- test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*'
|
||||
- require_in:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user