From 652c350785c05d7c27f66dccda668b24471238a4 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 21:31:38 +0100 Subject: [PATCH 01/12] fix(rubocop): add fixes using `rubocop --safe-auto-correct` --- test/integration/default/controls/config.rb | 4 ++-- test/integration/default/controls/package.rb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb index 54770b1..2af5bee 100644 --- a/test/integration/default/controls/config.rb +++ b/test/integration/default/controls/config.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + control 'Sudoers configuration' do title 'should match desired lines' @@ -17,7 +19,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 +44,4 @@ control 'Sudoers configuration' do its('mode') { should cmp '0440' } its('content') { should include '+other_netgroup ALL=(ALL) ALL' } end - end diff --git a/test/integration/default/controls/package.rb b/test/integration/default/controls/package.rb index 016eec0..e83d035 100644 --- a/test/integration/default/controls/package.rb +++ b/test/integration/default/controls/package.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true control 'Sudo package' do title 'should be installed' From a10ea35efa217535cdba3684c4f2ff066b4d01d3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 21:33:11 +0100 Subject: [PATCH 02/12] fix(rubocop): fix remaining errors manually --- test/integration/default/controls/config.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb index 2af5bee..baac9c4 100644 --- a/test/integration/default/controls/config.rb +++ b/test/integration/default/controls/config.rb @@ -10,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' } From 9df9a48754a1eadf33fb8b8c285a31162f25eae1 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 11 Oct 2019 21:35:13 +0100 Subject: [PATCH 03/12] ci(travis): merge `rubocop` linter into main `lint` job * Semi-automated using https://github.com/myii/ssf-formula/pull/65 --- .rubocop.yml | 2 ++ .travis.yml | 21 +++++---------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index bdae9aa..283b759 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -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 diff --git a/.travis.yml b/.travis.yml index 05c1d8e..55c36b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 From f94d7774db5c5084c82be6b91968eb67da57b95b Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 11 Oct 2019 21:36:48 +0000 Subject: [PATCH 04/12] chore(release): 0.22.1 [skip ci] ## [0.22.1](https://github.com/saltstack-formulas/sudoers-formula/compare/v0.22.0...v0.22.1) (2019-10-11) ### Bug Fixes * **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/sudoers-formula/commit/652c350)) * **rubocop:** fix remaining errors manually ([](https://github.com/saltstack-formulas/sudoers-formula/commit/a10ea35)) ### Continuous Integration * **kitchen:** change `log_level` to `debug` instead of `info` ([](https://github.com/saltstack-formulas/sudoers-formula/commit/2821526)) * **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/sudoers-formula/commit/9719ac9)) * **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/sudoers-formula/commit/e63f441)) * **kitchen+travis:** replace EOL pre-salted images ([](https://github.com/saltstack-formulas/sudoers-formula/commit/dea2da0)) * **platform:** add `arch-base-latest` ([](https://github.com/saltstack-formulas/sudoers-formula/commit/55ce214)) * merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/sudoers-formula/commit/f3a98c2)) * merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/sudoers-formula/commit/96dcd0f)) * use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround ([](https://github.com/saltstack-formulas/sudoers-formula/commit/7b44df2)) * **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/sudoers-formula/commit/9df9a48)) * **yamllint:** add rule `empty-values` & use new `yaml-files` setting ([](https://github.com/saltstack-formulas/sudoers-formula/commit/5e22568)) --- AUTHORS.md | 8 ++++---- CHANGELOG.md | 22 ++++++++++++++++++++++ FORMULA | 2 +- docs/AUTHORS.rst | 12 ++++++------ docs/CHANGELOG.rst | 25 +++++++++++++++++++++++++ 5 files changed, 58 insertions(+), 11 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 21ca094..7848622 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -4,12 +4,12 @@ This list is sorted by the number of commits per contributor in _descending_ ord Avatar|Contributor|Contributions :-:|---|:-: +@myii|[@myii](https://github.com/myii)|22 @nmadhok|[@nmadhok](https://github.com/nmadhok)|14 -@aboe76|[@aboe76](https://github.com/aboe76)|10 -@myii|[@myii](https://github.com/myii)|9 +@aboe76|[@aboe76](https://github.com/aboe76)|14 @carlosperello|[@carlosperello](https://github.com/carlosperello)|4 @whiteinge|[@whiteinge](https://github.com/whiteinge)|4 -@daks|[@daks](https://github.com/daks)|3 +@daks|[@daks](https://github.com/daks)|4 @andrew-vant|[@andrew-vant](https://github.com/andrew-vant)|2 @techhat|[@techhat](https://github.com/techhat)|2 @kev009|[@kev009](https://github.com/kev009)|2 @@ -34,4 +34,4 @@ Avatar|Contributor|Contributions --- -Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-08-17. +Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-11. diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ee6564..9b213e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## [0.22.1](https://github.com/saltstack-formulas/sudoers-formula/compare/v0.22.0...v0.22.1) (2019-10-11) + + +### Bug Fixes + +* **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/sudoers-formula/commit/652c350)) +* **rubocop:** fix remaining errors manually ([](https://github.com/saltstack-formulas/sudoers-formula/commit/a10ea35)) + + +### Continuous Integration + +* **kitchen:** change `log_level` to `debug` instead of `info` ([](https://github.com/saltstack-formulas/sudoers-formula/commit/2821526)) +* **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/sudoers-formula/commit/9719ac9)) +* **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/sudoers-formula/commit/e63f441)) +* **kitchen+travis:** replace EOL pre-salted images ([](https://github.com/saltstack-formulas/sudoers-formula/commit/dea2da0)) +* **platform:** add `arch-base-latest` ([](https://github.com/saltstack-formulas/sudoers-formula/commit/55ce214)) +* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/sudoers-formula/commit/f3a98c2)) +* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/sudoers-formula/commit/96dcd0f)) +* use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround ([](https://github.com/saltstack-formulas/sudoers-formula/commit/7b44df2)) +* **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/sudoers-formula/commit/9df9a48)) +* **yamllint:** add rule `empty-values` & use new `yaml-files` setting ([](https://github.com/saltstack-formulas/sudoers-formula/commit/5e22568)) + # [0.22.0](https://github.com/saltstack-formulas/sudoers-formula/compare/v0.21.1...v0.22.0) (2019-08-17) diff --git a/FORMULA b/FORMULA index d18378c..889f5e0 100644 --- a/FORMULA +++ b/FORMULA @@ -1,7 +1,7 @@ name: sudoers os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE os_family: Debian, RedHat, Suse -version: 0.22.0 +version: 0.22.1 release: 1 minimum_version: 2016.11 summary: Sudoers formula diff --git a/docs/AUTHORS.rst b/docs/AUTHORS.rst index 16494af..7742d67 100644 --- a/docs/AUTHORS.rst +++ b/docs/AUTHORS.rst @@ -13,15 +13,15 @@ This list is sorted by the number of commits per contributor in *descending* ord * - Avatar - Contributor - Contributions + * - :raw-html-m2r:`@myii` + - `@myii `_ + - 22 * - :raw-html-m2r:`@nmadhok` - `@nmadhok `_ - 14 * - :raw-html-m2r:`@aboe76` - `@aboe76 `_ - - 10 - * - :raw-html-m2r:`@myii` - - `@myii `_ - - 9 + - 14 * - :raw-html-m2r:`@carlosperello` - `@carlosperello `_ - 4 @@ -30,7 +30,7 @@ This list is sorted by the number of commits per contributor in *descending* ord - 4 * - :raw-html-m2r:`@daks` - `@daks `_ - - 3 + - 4 * - :raw-html-m2r:`@andrew-vant` - `@andrew-vant `_ - 2 @@ -98,4 +98,4 @@ This list is sorted by the number of commits per contributor in *descending* ord ---- -Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-08-17. +Auto-generated by a `forked version `_ of `gaocegege/maintainer `_ on 2019-10-11. diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index aac3d99..96c5bf1 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -2,6 +2,31 @@ Changelog ========= +`0.22.1 `_ (2019-10-11) +------------------------------------------------------------------------------------------------------------ + +Bug Fixes +^^^^^^^^^ + + +* **rubocop:** add fixes using ``rubocop --safe-auto-correct`` (\ ` `_\ ) +* **rubocop:** fix remaining errors manually (\ ` `_\ ) + +Continuous Integration +^^^^^^^^^^^^^^^^^^^^^^ + + +* **kitchen:** change ``log_level`` to ``debug`` instead of ``info`` (\ ` `_\ ) +* **kitchen:** install required packages to bootstrapped ``opensuse`` [skip ci] (\ ` `_\ ) +* **kitchen:** use bootstrapped ``opensuse`` images until ``2019.2.2`` [skip ci] (\ ` `_\ ) +* **kitchen+travis:** replace EOL pre-salted images (\ ` `_\ ) +* **platform:** add ``arch-base-latest`` (\ ` `_\ ) +* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` `_\ ) +* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` `_\ ) +* use ``dist: bionic`` & apply ``opensuse-leap-15`` SCP error workaround (\ ` `_\ ) +* **travis:** merge ``rubocop`` linter into main ``lint`` job (\ ` `_\ ) +* **yamllint:** add rule ``empty-values`` & use new ``yaml-files`` setting (\ ` `_\ ) + `0.22.0 `_ (2019-08-17) ------------------------------------------------------------------------------------------------------------ From 9a36e1a933d833ef16fc34eaceda8859866b2c8e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 14 Oct 2019 11:38:42 +0100 Subject: [PATCH 05/12] docs(readme): update link to `CONTRIBUTING` [skip ci] --- docs/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.rst b/docs/README.rst index a5a81d6..b7e8e0d 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -37,7 +37,7 @@ Contributing to this repo **Commit message formatting is significant!!** -Please see :ref:`How to contribute ` for more details. +Please see `How to contribute `_ for more details. Available states ---------------- From 67880a513e6da55c7beef8ce7b391c45953063f7 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Mon, 14 Oct 2019 12:30:39 +0100 Subject: [PATCH 06/12] docs(contributing): remove to use org-level file instead [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/70 --- docs/CONTRIBUTING.rst | 159 ------------------------------------------ 1 file changed, 159 deletions(-) delete mode 100644 docs/CONTRIBUTING.rst diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst deleted file mode 100644 index b7da8f4..0000000 --- a/docs/CONTRIBUTING.rst +++ /dev/null @@ -1,159 +0,0 @@ -.. _contributing: - -How to contribute -================= - -This document will eventually outline all aspects of guidance to make your contributing experience a fruitful and enjoyable one. -What it already contains is information about *commit message formatting* and how that directly affects the numerous automated processes that are used for this repo. -It also covers how to contribute to this *formula's documentation*. - -.. contents:: **Table of Contents** - -Overview --------- - -Submitting a pull request is more than just code! -To achieve a quality product, the *tests* and *documentation* need to be updated as well. -An excellent pull request will include these in the changes, wherever relevant. - -Commit message formatting -------------------------- - -Since every type of change requires making Git commits, -we will start by covering the importance of ensuring that all of your commit -messages are in the correct format. - -Automation of multiple processes -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -This formula uses `semantic-release `_ for automating numerous processes such as bumping the version number appropriately, creating new tags/releases and updating the changelog. -The entire process relies on the structure of commit messages to determine the version bump, which is then used for the rest of the automation. - -Full details are available in the upstream docs regarding the `Angular Commit Message Conventions `_. -The key factor is that the first line of the commit message must follow this format: - -.. code-block:: - - type(scope): subject - - -* E.g. ``docs(contributing): add commit message formatting instructions``. - -Besides the version bump, the changelog and release notes are formatted accordingly. -So based on the example above: - -.. - - .. raw:: html - -

Documentation

- - * **contributing:** add commit message formatting instructions - - -* The ``type`` translates into a ``Documentation`` sub-heading. -* The ``(scope):`` will be shown in bold text without the brackets. -* The ``subject`` follows the ``scope`` as standard text. - -Linting commit messages in Travis CI -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -This formula uses `commitlint `_ for checking commit messages during CI testing. -This ensures that they are in accordance with the ``semantic-release`` settings. - -For more details about the default settings, refer back to the ``commitlint`` `reference rules `_. - -Relationship between commit type and version bump -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -This formula applies some customisations to the defaults, as outlined in the table below, -based upon the `type `_ of the commit: - -.. list-table:: - :name: commit-type-vs-version-bump - :header-rows: 1 - :stub-columns: 0 - :widths: 1,2,3,1,1 - - * - Type - - Heading - - Description - - Bump (default) - - Bump (custom) - * - ``build`` - - Build System - - Changes related to the build system - - – - - - * - ``chore`` - - – - - Changes to the build process or auxiliary tools and libraries such as - documentation generation - - – - - - * - ``ci`` - - Continuous Integration - - Changes to the continuous integration configuration - - – - - - * - ``docs`` - - Documentation - - Documentation only changes - - – - - 0.0.1 - * - ``feat`` - - Features - - A new feature - - 0.1.0 - - - * - ``fix`` - - Bug Fixes - - A bug fix - - 0.0.1 - - - * - ``perf`` - - Performance Improvements - - A code change that improves performance - - 0.0.1 - - - * - ``refactor`` - - Code Refactoring - - A code change that neither fixes a bug nor adds a feature - - – - - 0.0.1 - * - ``revert`` - - Reverts - - A commit used to revert a previous commit - - – - - 0.0.1 - * - ``style`` - - Styles - - Changes that do not affect the meaning of the code (white-space, - formatting, missing semi-colons, etc.) - - – - - 0.0.1 - * - ``test`` - - Tests - - Adding missing or correcting existing tests - - – - - 0.0.1 - -Use ``BREAKING CHANGE`` to trigger a ``major`` version change -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Adding ``BREAKING CHANGE`` to the footer of the extended description of the commit message will **always** trigger a ``major`` version change, no matter which type has been used. -This will be appended to the changelog and release notes as well. -To preserve good formatting of these notes, the following format is prescribed: - -* ``BREAKING CHANGE: .`` - -An example of that: - -.. code-block:: git - - ... - - BREAKING CHANGE: With the removal of all of the `.sls` files under - `template package`, this formula no longer supports the installation of - packages. - From 2fe682effc8e129278da17a2bb3a9feb1f29fdd3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 23 Oct 2019 17:35:46 +0100 Subject: [PATCH 07/12] ci(travis): update `salt-lint` config for `v0.0.10` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/82 --- .salt-lint | 1 + 1 file changed, 1 insertion(+) diff --git a/.salt-lint b/.salt-lint index a539954..3715677 100644 --- a/.salt-lint +++ b/.salt-lint @@ -2,6 +2,7 @@ # vim: ft=yaml --- exclude_paths: [] +rules: {} 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 From b8d5c0bfa133213417273b64437ddcddf6d3491b Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 24 Oct 2019 18:12:43 +0100 Subject: [PATCH 08/12] ci(kitchen): use `debian-10-master-py3` instead of `develop` [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/84 --- .travis.yml | 2 +- kitchen.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55c36b0..3ef26fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ jobs: ## 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` - - env: INSTANCE=default-debian-10-develop-py3 + - env: INSTANCE=default-debian-10-master-py3 # - env: INSTANCE=default-ubuntu-1804-develop-py3 # - env: INSTANCE=default-centos-7-develop-py3 # - env: INSTANCE=default-fedora-30-develop-py3 diff --git a/kitchen.yml b/kitchen.yml index 0ca1cda..a6824f0 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -11,13 +11,13 @@ driver: # Make sure the platforms listed below match up with # the `env.matrix` instances defined in `.travis.yml` platforms: - ## SALT `develop` - - name: debian-10-develop-py3 + ## SALT `develop` => `master` + - name: debian-10-master-py3 driver: - image: netmanagers/salt-develop-py3:debian-10 + image: netmanagers/salt-master-py3:debian-10 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master - name: ubuntu-1804-develop-py3 driver: image: netmanagers/salt-develop-py3:ubuntu-18.04 From e32be015d6b4f8df0a1862d56d25cde4af2597a0 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 30 Oct 2019 04:49:44 +0000 Subject: [PATCH 09/12] ci(kitchen+travis): upgrade matrix after `2019.2.2` release [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/86 --- .travis.yml | 34 ++++++++-------- kitchen.yml | 109 ++++++++++++++++++++++------------------------------ 2 files changed, 63 insertions(+), 80 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ef26fc..53ef14e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ jobs: script: # Install and run `salt-lint` - pip install --user salt-lint - - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$' + - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$' | xargs -I {} salt-lint {} # Install and run `yamllint` # Need at least `v1.17.0` for the `yaml-files` setting @@ -51,31 +51,33 @@ jobs: # Make sure the instances listed below match up with # the `platforms` defined in `kitchen.yml` - env: INSTANCE=default-debian-10-master-py3 - # - env: INSTANCE=default-ubuntu-1804-develop-py3 - # - env: INSTANCE=default-centos-7-develop-py3 - # - env: INSTANCE=default-fedora-30-develop-py3 - # - env: INSTANCE=default-opensuse-leap-15-develop-py3 - # - env: INSTANCE=default-amazonlinux-2-develop-py2 - # - env: INSTANCE=default-arch-base-latest-develop-py2 + # - env: INSTANCE=default-ubuntu-1804-master-py3 + # - env: INSTANCE=default-centos-8-master-py3 + # - env: INSTANCE=default-fedora-31-master-py3 + # - env: INSTANCE=default-opensuse-leap-151-master-py3 + # - env: INSTANCE=default-amazonlinux-2-master-py2 + # - env: INSTANCE=default-arch-base-latest-master-py2 + # - env: INSTANCE=default-debian-10-2019-2-py3 # - env: INSTANCE=default-debian-9-2019-2-py3 - env: INSTANCE=default-ubuntu-1804-2019-2-py3 - # - env: INSTANCE=default-centos-7-2019-2-py3 - # - env: INSTANCE=default-fedora-30-2019-2-py3 - # - env: INSTANCE=default-opensuse-leap-15-2019-2-py3 + # - env: INSTANCE=default-centos-8-2019-2-py3 + # - env: INSTANCE=default-fedora-31-2019-2-py3 + - env: INSTANCE=default-opensuse-leap-151-2019-2-py3 + # - env: INSTANCE=default-centos-7-2019-2-py2 - env: INSTANCE=default-amazonlinux-2-2019-2-py2 - - env: INSTANCE=default-arch-base-latest-2019-2-py2 + # - env: INSTANCE=default-arch-base-latest-2019-2-py2 + - env: INSTANCE=default-fedora-30-2018-3-py3 # - env: INSTANCE=default-debian-9-2018-3-py2 # - env: INSTANCE=default-ubuntu-1604-2018-3-py2 # - env: INSTANCE=default-centos-7-2018-3-py2 - - env: INSTANCE=default-fedora-29-2018-3-py2 - - env: INSTANCE=default-opensuse-leap-15-2018-3-py2 + # - env: INSTANCE=default-opensuse-leap-151-2018-3-py2 # - env: INSTANCE=default-amazonlinux-2-2018-3-py2 - # - env: INSTANCE=default-arch-base-latest-2018-3-py2 + - env: INSTANCE=default-arch-base-latest-2018-3-py2 # - env: INSTANCE=default-debian-8-2017-7-py2 # - env: INSTANCE=default-ubuntu-1604-2017-7-py2 - env: INSTANCE=default-centos-6-2017-7-py2 - # - env: INSTANCE=default-fedora-29-2017-7-py2 - # - env: INSTANCE=default-opensuse-leap-15-2017-7-py2 + # - env: INSTANCE=default-fedora-30-2017-7-py2 + # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2 # - env: INSTANCE=default-amazonlinux-2-2017-7-py2 # - env: INSTANCE=default-arch-base-latest-2017-7-py2 diff --git a/kitchen.yml b/kitchen.yml index a6824f0..f3fa281 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -11,88 +11,83 @@ driver: # Make sure the platforms listed below match up with # the `env.matrix` instances defined in `.travis.yml` platforms: - ## SALT `develop` => `master` + ## SALT `master` - name: debian-10-master-py3 driver: image: netmanagers/salt-master-py3:debian-10 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - sh bootstrap-salt.sh -XdPbfrq -x python3 git master - - name: ubuntu-1804-develop-py3 + - name: ubuntu-1804-master-py3 driver: - image: netmanagers/salt-develop-py3:ubuntu-18.04 + image: netmanagers/salt-master-py3:ubuntu-18.04 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - - name: centos-7-develop-py3 + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master + - name: centos-8-master-py3 driver: - image: netmanagers/salt-develop-py3:centos-7 + image: netmanagers/salt-master-py3:centos-8 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - - name: fedora-30-develop-py3 + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master + - name: fedora-31-master-py3 driver: - image: netmanagers/salt-develop-py3:fedora-30 + image: netmanagers/salt-master-py3:fedora-31 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python3 git develop - - name: opensuse-leap-15-develop-py3 + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master + - name: opensuse-leap-151-master-py3 driver: - image: opensuse/leap:15 + image: netmanagers/salt-master-py3:opensuse-leap-15.1 provision_command: - # yamllint disable-line rule:line-length - - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip - - systemctl enable sshd.service + - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com + - sh bootstrap-salt.sh -XdPbfrq -x python3 git master run_command: /usr/lib/systemd/systemd - provisioner: - salt_bootstrap_options: -XdPfrq -x python3 git develop - salt_install: bootstrap - # Workaround to avoid intermittent failures on `opensuse-leap-15`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 - - name: amazonlinux-2-develop-py2 + - name: amazonlinux-2-master-py2 driver: - image: netmanagers/salt-develop-py2:amazonlinux-2 + image: netmanagers/salt-master-py2:amazonlinux-2 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop - - name: arch-base-latest-develop-py2 + - sh bootstrap-salt.sh -XdPbfrq -x python2 git master + - name: arch-base-latest-master-py2 driver: - image: netmanagers/salt-develop-py2:arch-base-latest + image: netmanagers/salt-master-py2:arch-base-latest provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop + - sh bootstrap-salt.sh -XdPbfrq -x python2 git master run_command: /usr/lib/systemd/systemd ## SALT `2019.2` + - name: debian-10-2019-2-py3 + driver: + image: netmanagers/salt-2019.2-py3:debian-10 - name: debian-9-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:debian-9 - name: ubuntu-1804-2019-2-py3 driver: image: netmanagers/salt-2019.2-py3:ubuntu-18.04 - - name: centos-7-2019-2-py3 + - name: centos-8-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:centos-7 - - name: fedora-30-2019-2-py3 + image: netmanagers/salt-2019.2-py3:centos-8 + - name: fedora-31-2019-2-py3 driver: - image: netmanagers/salt-2019.2-py3:fedora-30 - - name: opensuse-leap-15-2019-2-py3 + image: netmanagers/salt-2019.2-py3:fedora-31 + - name: opensuse-leap-151-2019-2-py3 driver: - image: opensuse/leap:15 - provision_command: - # yamllint disable-line rule:line-length - - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python3-pip - - systemctl enable sshd.service + image: netmanagers/salt-2019.2-py3:opensuse-leap-15.1 run_command: /usr/lib/systemd/systemd - provisioner: - salt_bootstrap_options: -XdPfrq -x python3 git 2019.2 - salt_install: bootstrap - # Workaround to avoid intermittent failures on `opensuse-leap-15`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + - name: centos-7-2019-2-py2 + driver: + image: netmanagers/salt-2019.2-py2:centos-7 - name: amazonlinux-2-2019-2-py2 driver: image: netmanagers/salt-2019.2-py2:amazonlinux-2 @@ -102,6 +97,9 @@ platforms: run_command: /usr/lib/systemd/systemd ## SALT `2018.3` + - name: fedora-30-2018-3-py3 + driver: + image: netmanagers/salt-2018.3-py3:fedora-30 - name: debian-9-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:debian-9 @@ -111,21 +109,11 @@ platforms: - name: centos-7-2018-3-py2 driver: image: netmanagers/salt-2018.3-py2:centos-7 - - name: fedora-29-2018-3-py2 + - name: opensuse-leap-151-2018-3-py2 driver: - image: netmanagers/salt-2018.3-py2:fedora-29 - - name: opensuse-leap-15-2018-3-py2 - driver: - image: opensuse/leap:15 - provision_command: - # yamllint disable-line rule:line-length - - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip - - systemctl enable sshd.service + image: netmanagers/salt-2018.3-py2:opensuse-leap-15.1 run_command: /usr/lib/systemd/systemd - provisioner: - salt_bootstrap_options: -XdPfrq -x python2 git 2018.3 - salt_install: bootstrap - # Workaround to avoid intermittent failures on `opensuse-leap-15`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 @@ -148,21 +136,14 @@ platforms: driver: image: netmanagers/salt-2017.7-py2:centos-6 run_command: /sbin/init - - name: fedora-29-2017-7-py2 + - name: fedora-30-2017-7-py2 driver: - image: netmanagers/salt-2017.7-py2:fedora-29 - - name: opensuse-leap-15-2017-7-py2 + image: netmanagers/salt-2017.7-py2:fedora-30 + - name: opensuse-leap-151-2017-7-py2 driver: - image: opensuse/leap:15 - provision_command: - # yamllint disable-line rule:line-length - - zypper install -y glibc-locale net-tools net-tools-deprecated python-xml python2-pip - - systemctl enable sshd.service + image: netmanagers/salt-2017.7-py2:opensuse-leap-15.1 run_command: /usr/lib/systemd/systemd - provisioner: - salt_bootstrap_options: -XdPfrq -x python2 git 2017.7 - salt_install: bootstrap - # Workaround to avoid intermittent failures on `opensuse-leap-15`: + # Workaround to avoid intermittent failures on `opensuse-leap-15.1`: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 From 551f300b4b340ef41ac1088164f05c15c6245a49 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 31 Oct 2019 10:32:31 +0000 Subject: [PATCH 10/12] fix(release.config.js): use full commit hash in commit link [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/89 --- .travis.yml | 10 +++++----- release.config.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53ef14e..afcea63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,8 +43,8 @@ jobs: - gem install rubocop - rubocop -d # Install and run `commitlint` - - npm install @commitlint/config-conventional -D - - npm install @commitlint/travis-cli -D + - npm i -D @commitlint/config-conventional + @commitlint/travis-cli - commitlint-travis ## Define the rest of the matrix based on Kitchen testing @@ -95,9 +95,9 @@ jobs: - maintainer contributor # Install all dependencies required for `semantic-release` - - npm install @semantic-release/changelog@3 -D - - npm install @semantic-release/exec@3 -D - - npm install @semantic-release/git@7 -D + - npm i -D @semantic-release/changelog@3 + @semantic-release/exec@3 + @semantic-release/git@7 deploy: provider: script skip_cleanup: true diff --git a/release.config.js b/release.config.js index afa0cb1..6af7aa8 100644 --- a/release.config.js +++ b/release.config.js @@ -63,7 +63,7 @@ module.exports = { } if (typeof commit.hash === `string`) { - commit.hash = commit.hash.substring(0, 7) + commit.shortHash = commit.hash.substring(0, 7) } if (typeof commit.subject === `string`) { From 8314aa0df1bc510b3efbd1c8a07f361f3f94f1f3 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sat, 2 Nov 2019 08:40:35 +0000 Subject: [PATCH 11/12] perf(travis): improve `salt-lint` invocation [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/90 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index afcea63..7d08f3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ jobs: # Install and run `salt-lint` - pip install --user salt-lint - git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$' - | xargs -I {} salt-lint {} + | xargs salt-lint # Install and run `yamllint` # Need at least `v1.17.0` for the `yaml-files` setting - pip install --user yamllint>=1.17.0 From 9f217a2675e459561666313c4a38f446accc2681 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Sun, 3 Nov 2019 11:38:32 +0000 Subject: [PATCH 12/12] ci(kitchen): use `develop` image until `master` is ready (`amazonlinux`) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/93 --- kitchen.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kitchen.yml b/kitchen.yml index f3fa281..c5c9590 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -47,12 +47,14 @@ platforms: # => SCP did not finish successfully (255): (Net::SCP::Error) transport: max_ssh_sessions: 1 + # Use the `develop` image temporarily until the `master` image is available + # Not changing the name to minimise disruption across all of the formulas - name: amazonlinux-2-master-py2 driver: - image: netmanagers/salt-master-py2:amazonlinux-2 + image: netmanagers/salt-develop-py2:amazonlinux-2 provision_command: - curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com - - sh bootstrap-salt.sh -XdPbfrq -x python2 git master + - sh bootstrap-salt.sh -XdPbfrq -x python2 git develop - name: arch-base-latest-master-py2 driver: image: netmanagers/salt-master-py2:arch-base-latest