Imran Iqbal
814092bdce
Merge pull request #519 from rfairburn/fix_ext_pillar
...
Fix: master.d template to support saltclass ext_pillar config
2021-11-30 23:40:24 +00:00
Imran Iqbal
d69386c52d
Merge pull request #524 from myii/ci/add-3004
...
ci(kitchen+gitlab): adjust matrix to add `3004`
2021-11-22 19:42:40 +00:00
Imran Iqbal
23ed1754ba
Merge pull request #523 from myii/test/merge-all-test-suites-into-single-suite
...
test: merge all test suites into a single (`default`) suite
2021-11-17 22:32:53 +00:00
Imran Iqbal
04a2253ba6
Merge pull request #521 from hkbakke/master
...
Fix repo management on Debian Bullseye and newer.
2021-11-05 09:37:54 +00:00
Imran Iqbal
d92681deb2
Merge pull request #500 from M2mobi/enterprise
...
Don't try to manage config for saltstack enterprise master plugin
2021-10-27 17:51:08 +01:00
Imran Iqbal
9f22f28121
Merge pull request #515 from myii/ci/add-CVE-3003.3-3002.7-3001.8
...
ci(kitchen+gitlab): adjust matrix to use 3003.3, 3002.7 & 3001.8
2021-10-05 11:16:33 +01:00
Imran Iqbal
91f63f29cf
Merge pull request #514 from netmanagers/fix-repo-name
...
Fix Debian's family repository filename
2021-09-17 20:08:49 +01:00
Imran Iqbal
0f725810c8
Merge pull request #492 from dth202/defaults-patch-1
...
fix(Defaults) master_type: str
2021-09-04 21:44:44 +01:00
Imran Iqbal
54e91cc3bd
Merge pull request #511 from myii/feat/update-FreeBSD-pkgs-to-py38
...
feat(freebsd): update packages from `py37-*` => `py38-*`
2021-07-14 17:27:32 +01:00
Imran Iqbal
d1a83c6643
Merge pull request #506 from myii/fix/update-repo-urls-to-saltproject.io
...
fix(repo): update repo urls to `repo.saltproject.io` (inc. fix for `oraclelinux-7`)
2021-05-25 21:26:25 +01:00
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
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
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
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
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
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
bc8d24ecef
Merge pull request #494 from myii/test/manage-map.jinja-verification
...
test(map): verify `map.jinja` dump using `_mapdata` state
2020-12-23 18:47:53 +00:00
Imran Iqbal
e4010902cb
Merge pull request #493 from myii/ci/add-3002
...
ci(kitchen+gitlab): adjust matrix to add `3002`
2020-12-20 23:34:12 +00:00
Imran Iqbal
2726585303
Merge pull request #488 from myii/feat/add-gentoo
...
feat: add Gentoo support
2020-10-12 23:14:44 +01:00
Imran Iqbal
403d370905
Merge pull request #487 from major0/feat/enable_metadata_server
...
feat: enable the metadata grains server by default
2020-09-20 18:32:29 +01:00
Imran Iqbal
57d9e8b235
Merge pull request #486 from noelmcloughlin/win
...
fix(windows): various fixes
2020-09-20 13:48:27 +01:00
Imran Iqbal
aecf1743fe
Merge pull request #482 from remichristiaan/restart_master_minion_last
...
fix(service): service salt-master and salt-minion to restart last
2020-08-25 22:46:36 +01:00
Imran Iqbal
88b5b451b2
Merge pull request #474 from sticky-note/fix/service
...
fix(service): service `salt-master` watch `remove-default-master-conf…
2020-07-17 13:19:25 +01:00
Imran Iqbal
5cee96484d
Merge pull request #477 from noelmcloughlin/fx
...
fix(minion): fix requisites from recent prs
2020-07-15 16:25:21 +01:00
Imran Iqbal
daaa04a102
Merge pull request #473 from sticky-note/fix/at-freebsd
...
fix(freebsd): command `at` is already present in base system
2020-07-01 05:47:41 +01:00
Imran Iqbal
38e385622d
Merge pull request #471 from dafyddj/test-windows
...
Add testing for Windows (both local and CI)
2020-06-28 23:17:20 +01:00
Imran Iqbal
91b0dabbe3
Merge pull request #472 from myii/ci/add-3001
...
ci(kitchen+travis): adjust matrix to add `3001`
2020-06-23 10:24:43 +01:00
Imran Iqbal
6617d823dd
Merge pull request #469 from myii/test/update-versions
...
test(pkgs_spec): simplify using `match` (trigger: update for `suse`)
2020-06-01 02:19:35 +01:00
Imran Iqbal
972fc63d3d
Merge pull request #467 from myii/ci/add-opensuse-leap-15.2
...
ci(kitchen+travis): adjust matrix to add `opensuse-leap-15.2`
2020-05-26 04:49:43 +01:00
Imran Iqbal
6359624c3a
Merge pull request #464 from myii/chore/standardise-structure-166
...
ci(kitchen+travis): adjust matrix to add `3000.2` & remove `2018.3`
2020-05-02 01:16:04 +01:00
Imran Iqbal
ed20b2662f
Merge pull request #458 from hatifnatt/feat-apt-pinning
...
feat(package): use apt-pinning to pin specific package version
2020-04-18 12:17:11 +01:00
Imran Iqbal
5a08868cdd
Merge pull request #462 from myii/chore/standardise-structure-146
...
ci(kitchen+travis): adjust matrix to update `3000` to `3000.1`
2020-04-01 23:46:04 +01:00
Imran Iqbal
676688311f
Merge pull request #461 from saltstack-formulas/ci/add-3000-remove-2017.7
...
ci(kitchen+travis): adjust matrix to add `3000` & remove `2017.7`
2020-03-21 13:08:19 +00:00
Imran Iqbal
7551ba5b0e
Merge pull request #460 from noelmcloughlin/version_cmp
...
fix(jinja): replace version_cmp with grains lookup
2020-03-19 13:23:59 +00:00
Imran Iqbal
10e8778647
Merge pull request #453 from cr1st1p/allow-disable-services
...
Allow disabling services or just ignoring them.
2020-03-11 07:10:33 +00:00
Imran Iqbal
718f5c7558
Merge pull request #421 from noelmcloughlin/metastate
...
feat(formula): add metastate per community convention
2020-02-20 14:51:51 +00:00
Imran Iqbal
b9c860be2e
Merge pull request #451 from sticky-note/fix/tpl_path
...
fix(tpl_path): salt master conf files
2020-02-13 08:55:22 +00:00
Imran Iqbal
c82cfe635c
Merge pull request #448 from noelmcloughlin/bumptest
...
test(versions): bump salt pkg versions for travis
2020-01-24 11:00:05 +00:00
Imran Iqbal
12c49b9eb1
Merge pull request #450 from noelmcloughlin/freebsdd
...
chore(cleanup): delete unused directory
2020-01-24 01:09:12 +00:00
Imran Iqbal
a7015c2b79
Merge pull request #443 from myii/test/update-for-new-opensuse-package
...
test(pkgs_spec): update for new `opensuse` package
2019-12-03 22:15:22 +00:00
Imran Iqbal
3606c23b50
Merge pull request #442 from aboe76/fix_error_shellcheck
...
fix(shellcheck): fix shellcheck error
2019-11-28 20:47:25 +00:00
Imran Iqbal
0ec74afe22
Merge pull request #441 from myii/ci/upgrade-matrix-after-2019.2.2
...
ci(kitchen+travis): upgrade matrix after `2019.2.2` release
2019-10-29 22:21:45 +00:00
Imran Iqbal
cc944cbbb5
Merge pull request #440 from myii/test/fix-salt-pkg-version-numbers
...
test(pkgs_spec): reset version from `2019.2.1` back to `2019.2.0`
2019-10-11 21:40:45 +01:00
Imran Iqbal
59c589474d
Merge pull request #439 from myii/ci/merge-matrix-and-add-salt-lint-and-rubocop
...
ci: merge travis matrix, add `salt-lint` & `rubocop` to `lint` job
2019-10-09 23:52:07 +01:00
Imran Iqbal
f428ce497c
Merge pull request #438 from myii/test/update-for-2019-2-1
...
test(pkgs_spec): update for `2019.2.1` release
2019-09-25 23:09:00 +01:00
Imran Iqbal
fa2e8fa75d
Merge pull request #435 from myii/chore/standardise-structure
...
feat: use `semantic-release` cross-formula standard structure
2019-09-17 07:25:24 +01:00
Imran Iqbal
23b2b7da64
Merge pull request #419 from sticky-note/fix/minion-version
...
fix(minion): Fix version compare in minion.sls
2019-08-25 23:38:19 +01:00
Imran Iqbal
81aeaa82d0
Merge pull request #428 from saltstack-formulas/myii-patch-1
...
fix(travis): disable two failing platforms until they can be fixed
2019-08-01 06:02:47 +01:00
Imran Iqbal
5fcadcdc59
fix(travis): disable two failing platforms until they can be fixed
...
* Every PR is currently showing as failed and `commitlint` is never running
* Disable these two platforms in the meantime; still ten platforms being tested
* `opensuse-423` is EOL in any case
2019-08-01 06:01:13 +01:00
Imran Iqbal
834d1a6025
Merge pull request #415 from daks/semantic-release
...
docs(semantic-release): implement an automated changelog
2019-05-14 19:11:30 +01:00
Imran Iqbal
7cec4c0bb3
Merge pull request #409 from alxwr/fix-raspbian
...
osmap: Raspbian used the Debian repo
2019-04-24 00:44:23 +01:00
Imran Iqbal
683f45579d
Merge pull request #406 from netmanagers/master
...
Update the testing matrix (5 distros, 2 python versions, 3 salt versions)
2019-04-02 07:08:21 +01:00
Imran Iqbal
1d9643b14b
Merge pull request #395 from aboe76/simplify-map.jinja
...
Simplify map.jinja revert deep_merge solution from #193
2019-01-26 21:54:08 +00:00
myii
784e2bc372
Update pillar.example for single-dir, multi-branch salt_formulas #239 ( #373 )
...
* Also minor unrelated updates/fixes
2018-06-11 20:38:58 +02:00
myii
91b666c75f
Improve limitations related to git.latest in salt.formulas ( #239 )
...
* Ensure options for formulas `git.latest` are also based on defaults
* Prevent erroneous remote tracking branch modification by `salt.formulas` #238
* Allow multiple envs to use the same gitdir for `salt.formulas`
* Ensure `gitdir` original branch is checked out after formulas `git.latest`
* Fix erroneous comment re: merging in `salt` pillar
2018-06-10 11:18:20 +02:00