Skip to content

Commit

Permalink
ci(kitchen+travis): upgrade matrix after 2019.2.2 release
Browse files Browse the repository at this point in the history
* Automated using myii/ssf-formula#86
  • Loading branch information
myii committed Oct 29, 2019
1 parent 0506a5c commit 6f2d174
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
script:
# Install and run `salt-lint`
- pip install --user salt-lint
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
| xargs -I {} salt-lint {}
# Install and run `yamllint`
# Need at least `v1.17.0` for the `yaml-files` setting
Expand All @@ -51,9 +51,9 @@ jobs:
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
- env: INSTANCE=repositories-debian-10-master-py3
# - env: INSTANCE=preferences-debian-10-master-py3
# - env: INSTANCE=repositories-ubuntu-1804-develop-py3
# - env: INSTANCE=preferences-ubuntu-1804-develop-py3
- env: INSTANCE=preferences-debian-10-master-py3
# - env: INSTANCE=repositories-ubuntu-1804-master-py3
# - env: INSTANCE=preferences-ubuntu-1804-master-py3
- env: INSTANCE=repositories-debian-9-2019-2-py3
- env: INSTANCE=preferences-debian-9-2019-2-py3
- env: INSTANCE=repositories-ubuntu-1804-2019-2-py3
Expand Down
8 changes: 4 additions & 4 deletions kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ driver:
# Make sure the platforms listed below match up with
# the `env.matrix` instances defined in `.travis.yml`
platforms:
## SALT `develop` => `master`
## SALT `master`
- name: debian-10-master-py3
driver:
image: netmanagers/salt-master-py3:debian-10
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master
- name: ubuntu-1804-develop-py3
- name: ubuntu-1804-master-py3
driver:
image: netmanagers/salt-develop-py3:ubuntu-18.04
image: netmanagers/salt-master-py3:ubuntu-18.04
provision_command:
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master

## SALT `2019.2`
- name: debian-9-2019-2-py3
Expand Down

0 comments on commit 6f2d174

Please sign in to comment.