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: v0.59.0
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: v0.59.1
Choose a head ref
  • 5 commits
  • 34 files changed
  • 3 contributors

Commits on Sep 19, 2019

  1. fix(pkgrepo): fix settings for opensuse

    @myii
    myii committed Sep 19, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    f00c9a7 View commit details

  2. fix(pkgrepo): provide settings for amazon

    @myii
    myii committed Sep 19, 2019
    Copy the full SHA
    cb726af View commit details

  3. refactor(kitchen+travis+inspec): use pre-salted images 

    * Semi-automated using myii/ssf-formula#36
* Restructure all tests according to updated test suites
* Improve tests where necessary (code style, new platforms and package versions)
    @myii
    myii committed Sep 19, 2019
    Copy the full SHA
    fc1d0b1 View commit details

Commits on Sep 20, 2019

  1. Merge pull request #436 from myii/chore/standardise-structure 

    refactor(kitchen+travis+inspec): use pre-salted images
    @daks
    daks authored Sep 20, 2019
    Copy the full SHA
    53f2604 View commit details

  2. chore(release): 0.59.1 [skip ci] 

    ## [0.59.1](v0.59.0...v0.59.1) (2019-09-20)

### Bug Fixes

* **pkgrepo:** fix settings for `opensuse` ([f00c9a7](f00c9a7))
* **pkgrepo:** provide settings for `amazon` ([cb726af](cb726af))

### Code Refactoring

* **kitchen+travis+inspec:** use pre-salted images ([fc1d0b1](fc1d0b1))
    @semantic-release-bot
    semantic-release-bot committed Sep 20, 2019
    Copy the full SHA
    e88fce1 View commit details
Showing with 547 additions and 240 deletions.
  1. +18 −25 .travis.yml
  2. +3 −3 AUTHORS.md
  3. +13 −0 CHANGELOG.md
  4. +1 −1 FORMULA
  5. +5 −5 docs/AUTHORS.rst
  6. +16 −0 docs/CHANGELOG.rst
  7. +126 −138 kitchen.yml
  8. +20 −13 salt/osfamilymap.yaml
  9. +6 −0 salt/osmap.yaml
  10. +9 −5 salt/pkgrepo/redhat/install.sls
  11. +2 −1 salt/pkgrepo/suse/install.sls
  12. +0 −12 test/integration/develop/pkgs_spec.rb
  13. +50 −0 test/integration/v201707-py2/README.md
  14. +12 −10 test/integration/{2019-2 → v201707-py2/controls}/pkgs_spec.rb
  15. 0 test/integration/{2017-7 → v201707-py2/controls}/service_spec.rb
  16. +17 −0 test/integration/v201707-py2/inspec.yml
  17. +50 −0 test/integration/v201803-py2/README.md
  18. +7 −6 test/integration/{2017-7 → v201803-py2/controls}/pkgs_spec.rb
  19. 0 test/integration/{2018-3 → v201803-py2/controls}/service_spec.rb
  20. +17 −0 test/integration/v201803-py2/inspec.yml
  21. +50 −0 test/integration/v201902-py2/README.md
  22. +11 −8 test/integration/{2018-3 → v201902-py2/controls}/pkgs_spec.rb
  23. 0 test/integration/{2019-2 → v201902-py2/controls}/service_spec.rb
  24. +17 −0 test/integration/v201902-py2/inspec.yml
  25. +50 −0 test/integration/v201902-py3/README.md
  26. +30 −0 test/integration/v201902-py3/controls/pkgs_spec.rb
  27. 0 test/integration/{develop → v201902-py3/controls}/service_spec.rb
  28. +17 −0 test/integration/v201902-py3/inspec.yml
  29. +0 −6 test/salt/pillar/develop-py3.sls
  30. 0 test/salt/pillar/{v2017-7-py2.sls → v201707-py2.sls}
  31. +0 −7 test/salt/pillar/v2018-3-py2-forced-version.sls
  32. 0 test/salt/pillar/{v2018-3-py2.sls → v201803-py2.sls}
  33. 0 test/salt/pillar/{v2019-2-py2.sls → v201902-py2.sls}
  34. 0 test/salt/pillar/{v2019-2-py3.sls → v201902-py3.sls}
43 changes: 18 additions & 25 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -24,31 +24,24 @@ env:
# 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

# develop-py3
- INSTANCE: develop-py3-debian-9
- INSTANCE: develop-py3-opensuse-150
# - INSTANCE: develop-py3-ubuntu-1804

# 2017.7-py2
- INSTANCE: v2017-7-py2-bootstrap-centos-6
# - INSTANCE: v2017-7-py2-debian-8
- INSTANCE: v2017-7-py2-ubuntu-1604

# 2018.3-py2
# - INSTANCE: v2018-3-py2-centos-7
- INSTANCE: v2018-3-py2-debian-8
- INSTANCE: v2018-3-py2-forced-version-fedora-29
# - INSTANCE: v2018-3-py2-ubuntu-1604

# 2019.2-py2
- INSTANCE: v2019-2-py2-centos-7
- INSTANCE: v2019-2-py2-fedora-30

# 2019.2-py3
# - INSTANCE: v2019-2-py3-debian-9
- INSTANCE: v2019-2-py3-opensuse-150
- INSTANCE: v2019-2-py3-ubuntu-1804
# - 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: 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: 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-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

script:
- bin/kitchen verify ${INSTANCE}
6 changes: 3 additions & 3 deletions AUTHORS.md
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ Avatar|Contributor|Contributions
<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)|98
<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
<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)|25
<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)|28
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|22
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|21
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|20
@@ -61,6 +61,7 @@ Avatar|Contributor|Contributions
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3762852?v=4' width='36' height='36' alt='@tobias-m'>|[@tobias-m](https://github.com/tobias-m)|2
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/17393048?v=4' width='36' height='36' alt='@ek9'>|[@ek9](https://github.com/ek9)|2
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/398720?v=4' width='36' height='36' alt='@tiger-seo'>|[@tiger-seo](https://github.com/tiger-seo)|2
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|2
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/2061751?v=4' width='36' height='36' alt='@matthew-parlette'>|[@matthew-parlette](https://github.com/matthew-parlette)|2
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/8395913?v=4' width='36' height='36' alt='@aanriot'>|[@aanriot](https://github.com/aanriot)|1
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/9849167?v=4' width='36' height='36' alt='@alejdg'>|[@alejdg](https://github.com/alejdg)|1
@@ -72,7 +73,6 @@ Avatar|Contributor|Contributions
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>|[@vutny](https://github.com/vutny)|1
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/278900?v=4' width='36' height='36' alt='@blast-hardcheese'>|[@blast-hardcheese](https://github.com/blast-hardcheese)|1
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/2487617?v=4' width='36' height='36' alt='@mecavity'>|[@mecavity](https://github.com/mecavity)|1
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|1
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/30061305?v=4' width='36' height='36' alt='@felix-russell'>|[@felix-russell](https://github.com/felix-russell)|1
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/12703819?v=4' width='36' height='36' alt='@Furlot'>|[@Furlot](https://github.com/Furlot)|1
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/2692848?v=4' width='36' height='36' alt='@iondulgheru'>|[@iondulgheru](https://github.com/iondulgheru)|1
@@ -106,4 +106,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-09-17.
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-09-20.
13 changes: 13 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## [0.59.1](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.0...v0.59.1) (2019-09-20)


### Bug Fixes

* **pkgrepo:** fix settings for `opensuse` ([f00c9a7](https://github.com/saltstack-formulas/salt-formula/commit/f00c9a7))
* **pkgrepo:** provide settings for `amazon` ([cb726af](https://github.com/saltstack-formulas/salt-formula/commit/cb726af))


### Code Refactoring

* **kitchen+travis+inspec:** use pre-salted images ([fc1d0b1](https://github.com/saltstack-formulas/salt-formula/commit/fc1d0b1))

# [0.59.0](https://github.com/saltstack-formulas/salt-formula/compare/v0.58.4...v0.59.0) (2019-09-17)


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, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
version: 0.59.0
version: 0.59.1
release: 1
minimum_version: 2015.8
summary: Formula for install Saltstack
10 changes: 5 additions & 5 deletions docs/AUTHORS.rst
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ This list is sorted by the number of commits per contributor in *descending* ord
- 54
* - :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>`_
- 25
- 28
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>`
- `@iggy <https://github.com/iggy>`_
- 22
@@ -184,6 +184,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/398720?v=4' width='36' height='36' alt='@tiger-seo'>`
- `@tiger-seo <https://github.com/tiger-seo>`_
- 2
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>`
- `@daks <https://github.com/daks>`_
- 2
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/2061751?v=4' width='36' height='36' alt='@matthew-parlette'>`
- `@matthew-parlette <https://github.com/matthew-parlette>`_
- 2
@@ -217,9 +220,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/2487617?v=4' width='36' height='36' alt='@mecavity'>`
- `@mecavity <https://github.com/mecavity>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>`
- `@daks <https://github.com/daks>`_
- 1
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/30061305?v=4' width='36' height='36' alt='@felix-russell'>`
- `@felix-russell <https://github.com/felix-russell>`_
- 1
@@ -314,4 +314,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 2019-09-17.
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-09-20.
16 changes: 16 additions & 0 deletions docs/CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,22 @@
Changelog
=========

`0.59.1 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.0...v0.59.1>`_ (2019-09-20)
---------------------------------------------------------------------------------------------------------

Bug Fixes
^^^^^^^^^


* **pkgrepo:** fix settings for ``opensuse`` (\ `f00c9a7 <https://github.com/saltstack-formulas/salt-formula/commit/f00c9a7>`_\ )
* **pkgrepo:** provide settings for ``amazon`` (\ `cb726af <https://github.com/saltstack-formulas/salt-formula/commit/cb726af>`_\ )

Code Refactoring
^^^^^^^^^^^^^^^^


* **kitchen+travis+inspec:** use pre-salted images (\ `fc1d0b1 <https://github.com/saltstack-formulas/salt-formula/commit/fc1d0b1>`_\ )

`0.59.0 <https://github.com/saltstack-formulas/salt-formula/compare/v0.58.4...v0.59.0>`_ (2019-09-17)
---------------------------------------------------------------------------------------------------------

Loading