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.4
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.5
Choose a head ref
  • 5 commits
  • 17 files changed
  • 2 contributors

Commits on Oct 8, 2019

  1. ci: merge travis matrix, add salt-lint & rubocop to lint job 

    * Automated using myii/ssf-formula#60
    @myii
    myii committed Oct 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    myii Imran Iqbal
    GPG key ID: 6D8629439D2B7819
    Verified
    Learn about vigilant mode
    Copy the full SHA
    64c6ba9 View commit details

Commits on Oct 10, 2019

  1. chore(issues): remove issues templates to use org-level templates [sk… 

    …ip ci]

* Automated using myii/ssf-formula#61
    @myii
    myii committed Oct 10, 2019
    Copy the full SHA
    bc2cc2c View commit details

Commits on Oct 11, 2019

  1. fix(rubocop): add fixes using rubocop --safe-auto-correct

    @myii
    myii committed Oct 11, 2019
    Copy the full SHA
    62f82a4 View commit details

  2. ci(travis): merge rubocop linter into main lint job 

    * Semi-automated using myii/ssf-formula#65
    @myii
    myii committed Oct 11, 2019
    Copy the full SHA
    4ea85e8 View commit details

  3. chore(release): 0.59.5 [skip ci] 

    ## [0.59.5](v0.59.4...v0.59.5) (2019-10-11)

### Bug Fixes

* **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](62f82a4))

### Continuous Integration

* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](64c6ba9))
* **travis:** merge `rubocop` linter into main `lint` job ([](4ea85e8))
    @semantic-release-bot
    semantic-release-bot committed Oct 11, 2019
    Copy the full SHA
    fda4c2d View commit details
68 changes: 0 additions & 68 deletions .github/ISSUE_TEMPLATE/bug_report.md
View file

This file was deleted.

42 changes: 0 additions & 42 deletions .github/ISSUE_TEMPLATE/feature_request.md
View file

This file was deleted.

21 changes: 5 additions & 16 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 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)|42
<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)|44
<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
@@ -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-10-10.
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-11.
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.5](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.4...v0.59.5) (2019-10-11)


### Bug Fixes

* **rubocop:** add fixes using `rubocop --safe-auto-correct` ([](https://github.com/saltstack-formulas/salt-formula/commit/62f82a4))


### Continuous Integration

* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/salt-formula/commit/64c6ba9))
* **travis:** merge `rubocop` linter into main `lint` job ([](https://github.com/saltstack-formulas/salt-formula/commit/4ea85e8))

## [0.59.4](https://github.com/saltstack-formulas/salt-formula/compare/v0.59.3...v0.59.4) (2019-10-10)


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.4
version: 0.59.5
release: 1
minimum_version: 2015.8
summary: Formula for install Saltstack
18 changes: 9 additions & 9 deletions Vagrantfile
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# frozen_string_literal: true

# -*- mode: ruby -*-
# vi: set ft=ruby :

# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
VAGRANTFILE_API_VERSION = "2"
VAGRANTFILE_API_VERSION = '2'

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.box = "ubuntu/trusty64"
config.vm.hostname = "salt"
config.vm.synced_folder "./", "/srv/salt", id: "vagrant-root"
config.vm.box = 'ubuntu/trusty64'
config.vm.hostname = 'salt'
config.vm.synced_folder './', '/srv/salt', id: 'vagrant-root'

config.ssh.forward_agent = true

config.vm.provider :virtualbox do |vb|
# Use VBoxManage to customize the VM. For example to change memory:
vb.customize ["modifyvm", :id, "--memory", "1024"]
end
if Vagrant.has_plugin?("vagrant-cachier")
config.cache.scope = :box
vb.customize ['modifyvm', :id, '--memory', '1024']
end
config.cache.scope = :box if Vagrant.has_plugin?('vagrant-cachier')

# Set up salt-master and minion
config.vm.provision "shell", path: "dev/setup-salt.sh"
config.vm.provision 'shell', path: 'dev/setup-salt.sh'
end
4 changes: 2 additions & 2 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>`_
- 42
- 44
* - :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
@@ -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-10-10.
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-11.
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.5 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.4...v0.59.5>`_ (2019-10-11)
---------------------------------------------------------------------------------------------------------

Bug Fixes
^^^^^^^^^


* **rubocop:** add fixes using ``rubocop --safe-auto-correct`` (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/62f82a4>`_\ )

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


* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/64c6ba9>`_\ )
* **travis:** merge ``rubocop`` linter into main ``lint`` job (\ ` <https://github.com/saltstack-formulas/salt-formula/commit/4ea85e8>`_\ )

`0.59.4 <https://github.com/saltstack-formulas/salt-formula/compare/v0.59.3...v0.59.4>`_ (2019-10-10)
---------------------------------------------------------------------------------------------------------

6 changes: 4 additions & 2 deletions test/integration/v201707-py2/controls/pkgs_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

version =
case platform[:family]
when 'redhat'
@@ -14,10 +16,10 @@
control 'salt packages' do
title 'should be installed'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe package(p) do
it { should be_installed }
its('version') { should eq version }
6 changes: 4 additions & 2 deletions test/integration/v201707-py2/controls/service_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# frozen_string_literal: true

control 'salt services' do
title 'should be running'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe service(p) do
it { should be_enabled }
it { should be_running }
6 changes: 4 additions & 2 deletions test/integration/v201803-py2/controls/pkgs_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

version =
case platform[:family]
when 'redhat'
@@ -9,10 +11,10 @@
control 'salt packages' do
title 'should be installed'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe package(p) do
it { should be_installed }
its('version') { should eq version }
6 changes: 4 additions & 2 deletions test/integration/v201803-py2/controls/service_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# frozen_string_literal: true

control 'salt services' do
title 'should be running'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe service(p) do
it { should be_enabled }
it { should be_running }
6 changes: 4 additions & 2 deletions test/integration/v201902-py2/controls/pkgs_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

version =
case platform[:family]
when 'redhat'
@@ -13,10 +15,10 @@
control 'salt packages' do
title 'should be installed'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe package(p) do
it { should be_installed }
its('version') { should eq version }
6 changes: 4 additions & 2 deletions test/integration/v201902-py2/controls/service_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# frozen_string_literal: true

control 'salt services' do
title 'should be running'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe service(p) do
it { should be_enabled }
it { should be_running }
6 changes: 4 additions & 2 deletions test/integration/v201902-py3/controls/pkgs_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

version =
case platform[:family]
when 'redhat'
@@ -18,10 +20,10 @@
control 'salt packages' do
title 'should be installed'

%w(
%w[
salt-master
salt-minion
).each do |p|
].each do |p|
describe package(p) do
it { should be_installed }
its('version') { should eq version }
Loading