Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: saltstack-formulas/salt-formula
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.7.1
Choose a base ref
...
head repository: saltstack-formulas/salt-formula
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.7.2
Choose a head ref
  • 6 commits
  • 13 files changed
  • 3 contributors

Commits on Dec 19, 2020

  1. ci(gitlab-ci): add rubocop linter (with allow_failure) [skip ci] 

    * Automated using myii/ssf-formula#277
    @myii
    myii committed Dec 19, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8417653 View commit details

Commits on Dec 20, 2020

  1. ci(commitlint): ensure upstream/master uses main repo URL [skip ci] 

    * Automated using myii/ssf-formula#278
    @myii
    myii committed Dec 20, 2020
    Copy the full SHA
    2a5b679 View commit details

  2. test(magnesium): add pillar and tests for 3002

    @myii
    myii committed Dec 20, 2020
    Copy the full SHA
    c066060 View commit details

  3. ci(kitchen+gitlab): adjust matrix to add 3002 

    * Semi-automated using myii/ssf-formula#280
    @myii
    myii committed Dec 20, 2020
    Copy the full SHA
    7df2445 View commit details

  4. Merge pull request #493 from myii/ci/add-3002 

    ci(kitchen+gitlab): adjust matrix to add `3002`
    @myii
    myii authored Dec 20, 2020
    Copy the full SHA
    e401090 View commit details

  5. chore(release): 1.7.2 [skip ci] 

    ## [1.7.2](v1.7.1...v1.7.2) (2020-12-20)

### Continuous Integration

* **commitlint:** ensure `upstream/master` uses main repo URL [skip ci] ([2a5b679](2a5b679))
* **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([8417653](8417653))
* **kitchen+gitlab:** adjust matrix to add `3002` ([7df2445](7df2445))

### Tests

* **magnesium:** add pillar and tests for `3002` ([c066060](c066060))
    @semantic-release-bot
    semantic-release-bot committed Dec 20, 2020
    Copy the full SHA
    b476d39 View commit details
88 changes: 60 additions & 28 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
image_precommit: &image_precommit
name: 'myii/ssf-pre-commit:2.9.2'
entrypoint: ['/bin/bash', '-c']
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
# `services`
services_docker_dind: &services_docker_dind
@@ -52,7 +53,8 @@ commitlint:
image: *image_commitlint
script:
# Add `upstream` remote to get access to `upstream/master`
- 'git remote add upstream ${CI_PROJECT_URL}.git'
- 'git remote add upstream
https://gitlab.com/saltstack-formulas/salt-formula.git'
- 'git fetch --all'
# Set default commit hashes for `--from` and `--to`
- 'export COMMITLINT_FROM="$(git merge-base upstream/master HEAD)"'
@@ -84,6 +86,19 @@ pre-commit:
script:
- 'pre-commit run --all-files --color always --verbose'

# Use a separate job for `rubocop` other than the one potentially run by `pre-commit`
# - The `pre-commit` check will only be available for formulas that pass the default
# `rubocop` check -- and must continue to do so
# - This job is allowed to fail, so can be used for all formulas
# - Furthermore, this job uses all of the latest `rubocop` features & cops,
# which will help when upgrading the `rubocop` linter used in `pre-commit`
rubocop:
allow_failure: true
stage: *stage_lint
image: *image_rubocop
script:
- 'rubocop -d -P -S --enable-pending-cops'

###############################################################################
# Define `test` template
###############################################################################
@@ -108,33 +123,50 @@ pre-commit:
## 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`
v3001-py3-debian-10-3001-py3: {extends: '.test_instance'}
# v3001-py3-debian-9-3001-py3: {extends: '.test_instance'}
v3001-py3-ubuntu-2004-3001-py3: {extends: '.test_instance'}
# v3001-py3-ubuntu-1804-3001-py3: {extends: '.test_instance'}
v3001-py3-centos-8-3001-py3: {extends: '.test_instance'}
# v3001-py3-centos-7-3001-py3: {extends: '.test_instance'}
v3001-py3-fedora-32-3001-py3: {extends: '.test_instance'}
# v3001-py3-fedora-31-3001-py3: {extends: '.test_instance'}
# v3001-py3-opensuse-leap-152-3001-py3: {extends: '.test_instance'}
# v3001-py3-amazonlinux-2-3001-py3: {extends: '.test_instance'}
v3001-py3-oraclelinux-8-3001-py3: {extends: '.test_instance'}
# v3001-py3-oraclelinux-7-3001-py3: {extends: '.test_instance'}
v3001-py3-gentoo-stage3-latest-3001-py3: {extends: '.test_instance'}
v3001-py3-gentoo-stage3-systemd-3001-py3: {extends: '.test_instance'}
# v3000-py3-debian-10-3000-3-py3: {extends: '.test_instance'}
# v3000-py3-debian-9-3000-3-py3: {extends: '.test_instance'}
# v3000-py3-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
# v3000-py3-centos-8-3000-3-py3: {extends: '.test_instance'}
# v3000-py3-centos-7-3000-3-py3: {extends: '.test_instance'}
v3000-py3-opensuse-leap-152-3000-3-py3: {extends: '.test_instance'}
v3000-py3-amazonlinux-2-3000-3-py3: {extends: '.test_instance'}
# v3000-py3-oraclelinux-8-3000-3-py3: {extends: '.test_instance'}
v3000-py3-oraclelinux-7-3000-3-py3: {extends: '.test_instance'}
v3000-py2-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
# v3000-py2-ubuntu-1604-3000-3-py2: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-latest-3000-3-py3: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-systemd-3000-3-py3: {extends: '.test_instance'}
v3002-py3-debian-10-3002-2-py3: {extends: '.test_instance'}
v3002-py3-debian-9-3002-2-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-2004-3002-2-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-1804-3002-2-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-1604-3002-2-py3: {extends: '.test_instance'}
v3002-py3-centos-8-3002-2-py3: {extends: '.test_instance'}
v3002-py3-centos-7-3002-2-py3: {extends: '.test_instance'}
v3002-py3-fedora-33-3002-2-py3: {extends: '.test_instance'}
# v3002-py3-fedora-32-3002-2-py3: {extends: '.test_instance'}
# v3002-py3-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
v3002-py3-amazonlinux-2-3002-2-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-8-3002-2-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-7-3002-2-py3: {extends: '.test_instance'}
v3002-py3-gentoo-stage3-latest-3002-2-py3: {extends: '.test_instance'}
v3002-py3-gentoo-stage3-systemd-3002-2-py3: {extends: '.test_instance'}
v3001-py3-debian-10-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-debian-9-3001-4-py3: {extends: '.test_instance'}
v3001-py3-ubuntu-2004-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-ubuntu-1804-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-ubuntu-1604-3001-4-py3: {extends: '.test_instance'}
v3001-py3-centos-8-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-centos-7-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-fedora-33-3001-4-py3: {extends: '.test_instance'}
v3001-py3-fedora-32-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-opensuse-leap-152-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-amazonlinux-2-3001-4-py3: {extends: '.test_instance'}
v3001-py3-oraclelinux-8-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-oraclelinux-7-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-latest-3001-4-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-systemd-3001-4-py3: {extends: '.test_instance'}
# v3000-py3-debian-10-3000-6-py3: {extends: '.test_instance'}
v3000-py3-debian-9-3000-6-py3: {extends: '.test_instance'}
v3000-py3-ubuntu-1804-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-ubuntu-1604-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-centos-8-3000-6-py3: {extends: '.test_instance'}
v3000-py3-centos-7-3000-6-py3: {extends: '.test_instance'}
v3000-py3-opensuse-leap-152-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-amazonlinux-2-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-oraclelinux-8-3000-6-py3: {extends: '.test_instance'}
v3000-py3-oraclelinux-7-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-latest-3000-6-py3: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-systemd-3000-6-py3: {extends: '.test_instance'}
# v3000-py2-ubuntu-1804-3000-6-py2: {extends: '.test_instance'}
v3000-py2-ubuntu-1604-3000-6-py2: {extends: '.test_instance'}

###############################################################################
# `release` stage: `semantic-release`
71 changes: 44 additions & 27 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -83,33 +83,50 @@ 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=v3001-py3-debian-10-3001-py3
# - env: INSTANCE=v3001-py3-debian-9-3001-py3
- env: INSTANCE=v3001-py3-ubuntu-2004-3001-py3
# - env: INSTANCE=v3001-py3-ubuntu-1804-3001-py3
- env: INSTANCE=v3001-py3-centos-8-3001-py3
# - env: INSTANCE=v3001-py3-centos-7-3001-py3
- env: INSTANCE=v3001-py3-fedora-32-3001-py3
# - env: INSTANCE=v3001-py3-fedora-31-3001-py3
# - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-py3
# - env: INSTANCE=v3001-py3-amazonlinux-2-3001-py3
- env: INSTANCE=v3001-py3-oraclelinux-8-3001-py3
# - env: INSTANCE=v3001-py3-oraclelinux-7-3001-py3
- env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-py3
- env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-py3
# - env: INSTANCE=v3000-py3-debian-10-3000-3-py3
# - env: INSTANCE=v3000-py3-debian-9-3000-3-py3
# - env: INSTANCE=v3000-py3-ubuntu-1804-3000-3-py3
# - env: INSTANCE=v3000-py3-centos-8-3000-3-py3
# - env: INSTANCE=v3000-py3-centos-7-3000-3-py3
- env: INSTANCE=v3000-py3-opensuse-leap-152-3000-3-py3
- env: INSTANCE=v3000-py3-amazonlinux-2-3000-3-py3
# - env: INSTANCE=v3000-py3-oraclelinux-8-3000-3-py3
- env: INSTANCE=v3000-py3-oraclelinux-7-3000-3-py3
- env: INSTANCE=v3000-py2-ubuntu-1804-3000-3-py2
# - env: INSTANCE=v3000-py2-ubuntu-1604-3000-3-py2
# - env: INSTANCE=v3000-py3-gentoo-stage3-latest-3000-3-py3
# - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-3-py3
- env: INSTANCE=v3002-py3-debian-10-3002-2-py3
- env: INSTANCE=v3002-py3-debian-9-3002-2-py3
- env: INSTANCE=v3002-py3-ubuntu-2004-3002-2-py3
- env: INSTANCE=v3002-py3-ubuntu-1804-3002-2-py3
- env: INSTANCE=v3002-py3-ubuntu-1604-3002-2-py3
- env: INSTANCE=v3002-py3-centos-8-3002-2-py3
- env: INSTANCE=v3002-py3-centos-7-3002-2-py3
- env: INSTANCE=v3002-py3-fedora-33-3002-2-py3
# - env: INSTANCE=v3002-py3-fedora-32-3002-2-py3
# - env: INSTANCE=v3002-py3-opensuse-leap-152-3002-2-py3
- env: INSTANCE=v3002-py3-amazonlinux-2-3002-2-py3
- env: INSTANCE=v3002-py3-oraclelinux-8-3002-2-py3
- env: INSTANCE=v3002-py3-oraclelinux-7-3002-2-py3
- env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-2-py3
- env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-2-py3
- env: INSTANCE=v3001-py3-debian-10-3001-4-py3
# - env: INSTANCE=v3001-py3-debian-9-3001-4-py3
- env: INSTANCE=v3001-py3-ubuntu-2004-3001-4-py3
# - env: INSTANCE=v3001-py3-ubuntu-1804-3001-4-py3
# - env: INSTANCE=v3001-py3-ubuntu-1604-3001-4-py3
- env: INSTANCE=v3001-py3-centos-8-3001-4-py3
# - env: INSTANCE=v3001-py3-centos-7-3001-4-py3
# - env: INSTANCE=v3001-py3-fedora-33-3001-4-py3
- env: INSTANCE=v3001-py3-fedora-32-3001-4-py3
# - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-4-py3
# - env: INSTANCE=v3001-py3-amazonlinux-2-3001-4-py3
- env: INSTANCE=v3001-py3-oraclelinux-8-3001-4-py3
# - env: INSTANCE=v3001-py3-oraclelinux-7-3001-4-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-4-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-4-py3
# - env: INSTANCE=v3000-py3-debian-10-3000-6-py3
- env: INSTANCE=v3000-py3-debian-9-3000-6-py3
- env: INSTANCE=v3000-py3-ubuntu-1804-3000-6-py3
# - env: INSTANCE=v3000-py3-ubuntu-1604-3000-6-py3
# - env: INSTANCE=v3000-py3-centos-8-3000-6-py3
- env: INSTANCE=v3000-py3-centos-7-3000-6-py3
- env: INSTANCE=v3000-py3-opensuse-leap-152-3000-6-py3
# - env: INSTANCE=v3000-py3-amazonlinux-2-3000-6-py3
# - env: INSTANCE=v3000-py3-oraclelinux-8-3000-6-py3
- env: INSTANCE=v3000-py3-oraclelinux-7-3000-6-py3
# - env: INSTANCE=v3000-py3-gentoo-stage3-latest-3000-6-py3
# - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-6-py3
# - env: INSTANCE=v3000-py2-ubuntu-1804-3000-6-py2
- env: INSTANCE=v3000-py2-ubuntu-1604-3000-6-py2

## Define the release stage that runs `semantic-release`
- stage: 'release'
4 changes: 2 additions & 2 deletions AUTHORS.md
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ This list is sorted by the number of commits per contributor in _descending_ ord

Avatar|Contributor|Contributions
:-:|---|:-:
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|140
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|145
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|100
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|71
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|54
@@ -111,4 +111,4 @@ Avatar|Contributor|Contributions

---

Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-12-16.
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2020-12-20.
14 changes: 14 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Changelog

## [1.7.2](https://github.com/saltstack-formulas/salt-formula/compare/v1.7.1...v1.7.2) (2020-12-20)


### Continuous Integration

* **commitlint:** ensure `upstream/master` uses main repo URL [skip ci] ([2a5b679](https://github.com/saltstack-formulas/salt-formula/commit/2a5b6798d4a0c31f74d849f3f9df13a9cf29b9da))
* **gitlab-ci:** add `rubocop` linter (with `allow_failure`) [skip ci] ([8417653](https://github.com/saltstack-formulas/salt-formula/commit/8417653525c62e30493b2788e0c9ab6224ffe4af))
* **kitchen+gitlab:** adjust matrix to add `3002` ([7df2445](https://github.com/saltstack-formulas/salt-formula/commit/7df24454812c6bbd48a9c07c877efba4df194852))


### Tests

* **magnesium:** add pillar and tests for `3002` ([c066060](https://github.com/saltstack-formulas/salt-formula/commit/c0660608d7780483f0c1ebdd57b0873c3d62cb56))

## [1.7.1](https://github.com/saltstack-formulas/salt-formula/compare/v1.7.0...v1.7.1) (2020-12-16)


2 changes: 1 addition & 1 deletion FORMULA
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: salt
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Oracle, Amazon, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, FreeBSD, OpenBSD, Windows
os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
version: 1.7.1
version: 1.7.2
release: 1
minimum_version: 2015.8
summary: Formula for install Saltstack
4 changes: 2 additions & 2 deletions docs/AUTHORS.rst
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
- Contributions
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
- `@myii <https://github.com/myii>`_
- 140
- 145
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
- `@aboe76 <https://github.com/aboe76>`_
- 100
@@ -329,4 +329,4 @@ This list is sorted by the number of commits per contributor in *descending* ord

----

Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2020-12-16.
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2020-12-20.
17 changes: 17 additions & 0 deletions docs/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,23 @@
Changelog
=========

`1.7.2 <https://github.com/saltstack-formulas/salt-formula/compare/v1.7.1...v1.7.2>`_ (2020-12-20)
------------------------------------------------------------------------------------------------------

Continuous Integration
^^^^^^^^^^^^^^^^^^^^^^


* **commitlint:** ensure ``upstream/master`` uses main repo URL [skip ci] (\ `2a5b679 <https://github.com/saltstack-formulas/salt-formula/commit/2a5b6798d4a0c31f74d849f3f9df13a9cf29b9da>`_\ )
* **gitlab-ci:** add ``rubocop`` linter (with ``allow_failure``\ ) [skip ci] (\ `8417653 <https://github.com/saltstack-formulas/salt-formula/commit/8417653525c62e30493b2788e0c9ab6224ffe4af>`_\ )
* **kitchen+gitlab:** adjust matrix to add ``3002`` (\ `7df2445 <https://github.com/saltstack-formulas/salt-formula/commit/7df24454812c6bbd48a9c07c877efba4df194852>`_\ )

Tests
^^^^^


* **magnesium:** add pillar and tests for ``3002`` (\ `c066060 <https://github.com/saltstack-formulas/salt-formula/commit/c0660608d7780483f0c1ebdd57b0873c3d62cb56>`_\ )

`1.7.1 <https://github.com/saltstack-formulas/salt-formula/compare/v1.7.0...v1.7.1>`_ (2020-12-16)
------------------------------------------------------------------------------------------------------

Loading