E5FB ci(kitchen+travis): upgrade matrix after `2019.2.2` release [skip ci] · saltstack-formulas/apt-formula@6187515 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6187515

Browse files
myiimyii
committed
ci(kitchen+travis): upgrade matrix after 2019.2.2 release [skip ci]
* Automated using myii/ssf-formula#86
1 parent 0506a5c commit 6187515

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

‎.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
script:
3434
# Install and run `salt-lint`
3535
- pip install --user salt-lint
36-
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
36+
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$\|\.tst$'
3737
| xargs -I {} salt-lint {}
3838
# Install and run `yamllint`
3939
# Need at least `v1.17.0` for the `yaml-files` setting
@@ -51,9 +51,9 @@ jobs:
5151
# Make sure the instances listed below match up with
5252
# the `platforms` defined in `kitchen.yml`
5353
- env: INSTANCE=repositories-debian-10-master-py3
54-
# - env: INSTANCE=preferences-debian-10-master-py3
55-
# - env: INSTANCE=repositories-ubuntu-1804-develop-py3
56-
# - env: INSTANCE=preferences-ubuntu-1804-develop-py3
54+
- env: INSTANCE=preferences-debian-10-master-py3
55+
# - env: INSTANCE=repositories-ubuntu-1804-master-py3
56+
# - env: INSTANCE=preferences-ubuntu-1804-master-py3
5757
- env: INSTANCE=repositories-debian-9-2019-2-py3
5858
- env: INSTANCE=preferences-debian-9-2019-2-py3
5959
- env: INSTANCE=repositories-ubuntu-1804-2019-2-py3

‎kitchen.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ driver:
1111
# Make sure the platforms listed below match up with
1212
# the `env.matrix` instances defined in `.travis.yml`
1313
platforms:
14-
## SALT `develop` => `master`
14+
## SALT `master`
1515
- name: debian-10-master-py3
1616
driver:
1717
image: netmanagers/salt-master-py3:debian-10
1818
provision_command:
1919
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
2020
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master
21-
- name: ubuntu-1804-develop-py3
21+
- name: ubuntu-1804-master-py3
2222
driver:
23-
image: netmanagers/salt-develop-py3:ubuntu-18.04
23+
image: netmanagers/salt-master-py3:ubuntu-18.04
2424
provision_command:
2525
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
26-
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
26+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git master
2727

2828
## SALT `2019.2`
2929
- name: debian-9-2019-2-py3

0 commit comments

Comments
 (0)
0