2
0
Commit Graph

1079 Commits

Author SHA1 Message Date
Imran Iqbal
65f9f27fc9
Merge pull request #505 from myii/fix/use-retry-options-for-all-services-on-freebsd
fix(freebsd): use `retry_options` to avoid spurious service failures
2021-04-24 17:09:12 +01:00
Imran Iqbal
698b7eae59
fix(freebsd): use retry_options to avoid spurious service failures
Use the `retry_options` already being used for the Salt minion service,
since we're getting failures such as this one:

* https://github.com/myii/salt-formula/runs/2415072504

This is made worse by the fact that GitHub Actions cannot re-run a
single job (at the current time).
2021-04-23 09:14:10 +01:00
semantic-release-bot
0e96047b16 chore(release): 1.8.3 [skip ci]
## [1.8.3](https://github.com/saltstack-formulas/salt-formula/compare/v1.8.2...v1.8.3) (2021-04-22)

### Continuous Integration

* **kitchen+gitlab:** adjust matrix to add `3003` ([480b7ed](480b7edbfb))
* **vagrant:** add FreeBSD 13.0 [skip ci] ([6316991](6316991334))
* **vagrant:** add Windows 10 pre-salted box [skip ci] ([fd285d8](fd285d8c5b))

### Tests

* **aluminium:** add pillar, tests and verification files for `3003` ([752a1de](752a1dea22))
* **freebsd:** add `map.jinja` verification file (for 13.0) ([10ae613](10ae613cae))
2021-04-22 23:23:12 +00:00
Imran Iqbal
18839da929
Merge pull request #504 from myii/ci/add-3003
ci(kitchen+gitlab): adjust matrix to add `3003`
2021-04-23 00:17:15 +01:00
Imran Iqbal
480b7edbfb
ci(kitchen+gitlab): adjust matrix to add 3003
* Semi-automated using https://github.com/myii/ssf-formula/pull/318
2021-04-22 23:53:05 +01:00
Imran Iqbal
752a1dea22
test(aluminium): add pillar, tests and verification files for 3003 2021-04-22 08:52:57 +01:00
Imran Iqbal
6316991334
ci(vagrant): add FreeBSD 13.0 [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/316
2021-04-19 23:34:37 +01:00
Imran Iqbal
10ae613cae
test(freebsd): add map.jinja verification file (for 13.0) 2021-04-19 23:34:37 +01:00
Imran Iqbal
fd285d8c5b
ci(vagrant): add Windows 10 pre-salted box [skip ci]
* Semi-automated using https://github.com/myii/ssf-formula/pull/313
* Add Window 10 map verification file
2021-04-14 08:24:30 +01:00
semantic-release-bot
ff31dfb18e chore(release): 1.8.2 [skip ci]
## [1.8.2](https://github.com/saltstack-formulas/salt-formula/compare/v1.8.1...v1.8.2) (2021-04-09)

### Bug Fixes

* **freebsd:** fix package names [skip ci] ([a30f124](a30f124485))

### Continuous Integration

* **vagrant:** use pre-salted boxes & conditional local settings [skip ci] ([5941618](5941618c6e))

### Tests

* **freebsd-11:** fix `osfinger` in comment [skip ci] ([26f2cc1](26f2cc1ef0))
2021-04-09 14:14:36 +00:00
Raphaël Hertzog
97299983ba
Ensure consistent ordering of module_config entries
Right now when you set module_config entries in your pillar data
like this:
salt:
  minion:
    module_config:
      smtp.from: 'Kali Salt <admins+salt@kali.org>'
      smtp.to: 'Kali Admins <admins+salt@kali.org>'
      smtp.host: localhost
      smtp.subject: 'Results of salt actions on'
      smtp.fields: id,fun

On each run, you will always a different ordering of the various
fields in the minion configuration file, leading to spurious restart
of the minion and admin annoyance:

          ID: salt-minion
    Function: file.recurse
        Name: /etc/salt/minion.d
      Result: True
     Comment: Recursively updated /etc/salt/minion.d
     Started: 13:39:25.689775
    Duration: 874.318 ms
     Changes:
              ----------
              /etc/salt/minion.d/f_defaults.conf:
                  ----------
                  diff:
                      ---
                      +++
                      @@ -930,10 +930,10 @@
                       # A dict for the test module:
                       #test.baz: {spam: sausage, cheese: bread}
                       #
                      +smtp.fields: id,fun
                      +smtp.from: Kali Salt <admins+salt@kali.org>
                       smtp.to: Kali Admins <admins+salt@kali.org>
                      -smtp.fields: id,fun
                       smtp.host: localhost
                      -smtp.from: Kali Salt <admins+salt@kali.org>
                       smtp.subject: Results of salt actions on

With the change here, this bad behaviour is gone...
2021-04-09 16:02:36 +02:00
Imran Iqbal
5941618c6e
ci(vagrant): use pre-salted boxes & conditional local settings [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/311
2021-04-05 18:54:57 +01:00
Imran Iqbal
157e566008
chore: update CODEOWNERS & .yamllint re: kitchen-vagrant [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/310
2021-04-05 18:21:48 +01:00
Imran Iqbal
a30f124485
fix(freebsd): fix package names [skip ci]
Resolves issues introduced in 24ebbb4e0c.
2021-04-04 15:41:53 +01:00
Imran Iqbal
26f2cc1ef0
test(freebsd-11): fix osfinger in comment [skip ci] 2021-03-31 08:15:43 +01:00
semantic-release-bot
f457a807b0 chore(release): 1.8.1 [skip ci]
## [1.8.1](https://github.com/saltstack-formulas/salt-formula/compare/v1.8.0...v1.8.1) (2021-03-30)

### Bug Fixes

* **freebsd:** update to provide support for most recent versions ([24ebbb4](24ebbb4e0c))
* **openbsd:** update to provide support for most recent versions ([61201de](61201de8c6))
* **osfamilymap:** use `whoami` for Windows `rootuser` ([69d5981](69d598138e)), closes [#495](https://github.com/saltstack-formulas/salt-formula/issues/495)

### Code Refactoring

* **retry_options:** provide options from defaults/pillar ([bbd7286](bbd7286240))

### Continuous Integration

* enable Vagrant-based testing using GitHub Actions ([163c77f](163c77fcee))
* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([cfefcc8](cfefcc83c0))
* **windows:** use `kitchen.windows.yml` ([c6043fb](c6043fbc9d))

### Documentation

* **readme:** add `Testing with Vagrant` section ([ef1bc02](ef1bc02a86))

### Tests

* update for new platforms (inc. using `system` library) ([e6bcdc1](e6bcdc1b4d))
* **_mapdata:** add Arch Linux verification file ([e31a56e](e31a56e7a3))
* add Windows map verification files ([e0afe89](e0afe89f24))
* standardise use of `share` suite & `_mapdata` state [skip ci] ([9816f47](9816f473c5))
2021-03-30 13:09:39 +00:00
Imran Iqbal
5523523213
Merge pull request #502 from myii/ci/add-vagrant-testing-via-github-actions
ci: enable Vagrant-based testing using GitHub Actions
2021-03-30 14:03:32 +01:00
Imran Iqbal
e6bcdc1b4d
test: update for new platforms (inc. using system library) 2021-03-30 13:21:00 +01:00
Imran Iqbal
61201de8c6
fix(openbsd): update to provide support for most recent versions 2021-03-30 12:40:41 +01:00
Imran Iqbal
24ebbb4e0c
fix(freebsd): update to provide support for most recent versions 2021-03-30 12:40:41 +01:00
Imran Iqbal
bbd7286240
refactor(retry_options): provide options from defaults/pillar 2021-03-30 12:40:40 +01:00
Imran Iqbal
e31a56e7a3
test(_mapdata): add Arch Linux verification file 2021-03-30 12:03:13 +01:00
Imran Iqbal
e0afe89f24
test: add Windows map verification files 2021-03-30 12:03:12 +01:00
Imran Iqbal
69d598138e
fix(osfamilymap): use whoami for Windows rootuser
Fix #495
2021-03-30 12:02:12 +01:00
Imran Iqbal
ef1bc02a86
docs(readme): add Testing with Vagrant section 2021-03-26 15:00:41 +00:00
Imran Iqbal
163c77fcee
ci: enable Vagrant-based testing using GitHub Actions
* Semi-automated using https://github.com/myii/ssf-formula/pull/304
2021-03-26 11:26:26 +00:00
Imran Iqbal
9816f473c5
test: standardise use of share suite & _mapdata state [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/302
2021-03-23 21:33:02 +00:00
Imran Iqbal
cfefcc83c0
ci(kitchen+ci): use latest pre-salted images (after CVE) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/299
2021-03-07 22:22:21 +00:00
Dafydd Jones
e48ebb6431
Merge pull request #499 from myii/ci/move-to-kitchen.windows.yml
ci(windows): use `kitchen.windows.yml`
2021-03-06 20:44:22 +00:00
semantic-release-bot
c6043fbc9d
ci(windows): use kitchen.windows.yml 2021-03-05 18:46:51 +00:00
Imran Iqbal
c38bb77b31
chore(yamllint): add .git/ to ignores [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/297
2021-03-05 18:35:15 +00:00
semantic-release-bot
8c5bf2f9d9 chore(release): 1.8.0 [skip ci]
# [1.8.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.7.5...v1.8.0) (2021-03-03)

### Features

* allow selecting alternate salt package repositories ([8742ab3](8742ab30bb))

### Tests

* **debian+ubuntu:** update `pkgrepo` to use `https` instead of `http` ([e94a8c9](e94a8c9dce))
2021-03-03 21:35:14 +00:00
Imran Iqbal
d35f43bb8e
Merge pull request #498 from major0/feat/select_salt_repo_url
feat: allow selecting alternate salt package repositories
2021-03-03 21:29:27 +00:00
Imran Iqbal
e94a8c9dce
test(debian+ubuntu): update pkgrepo to use https instead of http
```
$ GREP_SED="\(pkgrepo: deb http\):" \
  && grep -rl "${GREP_SED}" test/integration/v* \
     | xargs sed -i -e "/${GREP_SED}/s//\1s:/"
```
2021-03-03 21:10:07 +00:00
Mark Ferrell
8742ab30bb
feat: allow selecting alternate salt package repositories
Make the upstream salt package repository selectable, thus allowing the
use of archived salt versions (hosted in
https://archive.repo.saltproject.io), as well as custom salt versions
hosted in alternate repositories.
2021-03-03 20:46:56 +00:00
semantic-release-bot
b854b904cc chore(release): 1.7.5 [skip ci]
## [1.7.5](https://github.com/saltstack-formulas/salt-formula/compare/v1.7.4...v1.7.5) (2021-03-02)

### Bug Fixes

* revert to using `is mapping` in Jinja2 ([a89fb3f](a89fb3f4aa))

### Continuous Integration

* **gemfile+lock:** use `ssf` customised `kitchen-docker` repo [skip ci] ([25fea89](25fea89238))
* **kitchen+gitlab-ci:** use latest pre-salted images [skip ci] ([fb9901e](fb9901e3ac))
* **pre-commit:** update hook for `rubocop` [skip ci] ([a874a76](a874a76967))
2021-03-02 11:04:37 +00:00
Imran Iqbal
840624f2e3
Merge pull request #497 from dafyddj/fix/is-mapping-v3002.5
fix: revert to using `is mapping` in Jinja2
2021-03-02 10:52:12 +00:00
Dafydd Jones
a89fb3f4aa fix: revert to using is mapping in Jinja2
* CVE-2021-25283 enables Jinja2 safe mode, which breaks use of
  `'dict' in x.__class__.__name__` workaround
* Workaround no longer needed as CentOS 6 is EOL
2021-03-02 00:40:07 +00:00
Daniel Dehennin
6dbba14a29
chore(rubocop): allow use of YAML.load for _mapdata.rb [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/296
2021-02-23 21:51:25 +00:00
Dafydd Jones
4dc422598b
chore(shellcheck): switch hook for shellcheck [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/295
2021-02-21 08:33:49 +00:00
Imran Iqbal
25fea89238
ci(gemfile+lock): use ssf customised kitchen-docker repo [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/294
2021-02-17 13:53:34 +00:00
Imran Iqbal
fb9901e3ac
ci(kitchen+gitlab-ci): use latest pre-salted images [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/293
2021-02-14 07:45:50 +00:00
Imran Iqbal
f00d7ad348
chore: standardise structure (.gitignore & _mapdata.rb) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/292
2021-02-11 11:53:32 +00:00
Imran Iqbal
a874a76967
ci(pre-commit): update hook for rubocop [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/290
2021-02-02 00:23:03 +00:00
semantic-release-bot
87bbc6a23b chore(release): 1.7.4 [skip ci]
## [1.7.4](https://github.com/saltstack-formulas/salt-formula/compare/v1.7.3...v1.7.4) (2021-01-29)

### Bug Fixes

* **osfamilymap:** update openSUSE `pkgrepo` URLs ([48f8da0](48f8da0357))
* **pkgrepo/suse/install:** avoid managing repo if it already exists ([d5320a3](d5320a35ed)), closes [/github.com/saltstack/salt/blob/45cc49daed1618dbe89e1f012128c8dcab00b356/salt/modules/zypperpkg.py#L1262-L1265](45cc49daed/salt/modules/zypperpkg.py/issues/L1262-L1265)

### Continuous Integration

* **kitchen+gitlab:** update for new pre-salted images ([a9413e8](a9413e8c29))

### Tests

* **tumbleweed:** add map verification files ([6aeaa5a](6aeaa5ac94))
2021-01-29 11:56:25 +00:00
Imran Iqbal
14bac947fb
Merge pull request #496 from myii/ci/update-for-new-pre-salted-images
ci(kitchen+gitlab): update for new pre-salted images
2021-01-29 11:42:47 +00:00
Imran Iqbal
d5320a35ed
fix(pkgrepo/suse/install): avoid managing repo if it already exists
Use ugly `zypper lr --uri` hack to get around failure if the `base_url`
already exists under a different name:

```
      ID: salt-pkgrepo-install-saltstack-suse
Function: pkgrepo.managed
    Name: systemsmanagement_saltstack_products
  Result: False
 Comment: Failed to configure repo 'systemsmanagement_saltstack_products':
          Repository 'systemsmanagement_saltstack_products' already exists as 'systemsmanagement_saltstack'.
 Started: 09:28:39.154054
Duration: 2760.727 ms
```

Upstream code:

* 45cc49daed/salt/modules/zypperpkg.py (L1262-L1265)
2021-01-29 11:23:00 +00:00
Imran Iqbal
6aeaa5ac94
test(tumbleweed): add map verification files 2021-01-29 11:22:59 +00:00
Imran Iqbal
48f8da0357
fix(osfamilymap): update openSUSE pkgrepo URLs 2021-01-29 11:22:59 +00:00
Imran Iqbal
a9413e8c29
ci(kitchen+gitlab): update for new pre-salted images
* Semi-automated using https://github.com/myii/ssf-formula/pull/288
2021-01-29 11:05:57 +00:00