Skip to content

Commit a9cadb3

Browse files
committed
ci(kitchen+travis): modify matrix to include develop platform
* Use balanced matrix based on `template-formula` guidelines * Initial ref: saltstack-formulas/template-formula#118
1 parent 017cc29 commit a9cadb3

File tree

2 files changed

+49
-10
lines changed

2 files changed

+49
-10
lines changed

.travis.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,30 @@ addons:
2020
# the `platforms` defined in `kitchen.yml`
2121
env:
2222
matrix:
23-
- INSTANCE: default-debian-9-2019-2-py3
23+
- INSTANCE: default-debian-9-develop-py3
24+
# - INSTANCE: default-ubuntu-1804-develop-py3
25+
# - INSTANCE: default-centos-7-develop-py3
26+
# - INSTANCE: default-fedora-29-develop-py3
27+
# - INSTANCE: default-opensuse-leap-15-develop-py3
28+
# - INSTANCE: default-debian-9-2019-2-py3
2429
- INSTANCE: default-ubuntu-1804-2019-2-py3
2530
- INSTANCE: default-centos-7-2019-2-py3
26-
- INSTANCE: default-fedora-29-2019-2-py3
27-
- INSTANCE: default-opensuse-leap-15-2019-2-py3
28-
- INSTANCE: default-debian-9-2018-3-py2
29-
- INSTANCE: default-ubuntu-1604-2018-3-py2
30-
- INSTANCE: default-centos-7-2018-3-py2
31+
# - INSTANCE: default-fedora-29-2019-2-py3
32+
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
33+
# - INSTANCE: default-debian-9-2018-3-py2
34+
# - INSTANCE: default-ubuntu-1604-2018-3-py2
35+
# - INSTANCE: default-centos-7-2018-3-py2
3136
- INSTANCE: default-fedora-29-2018-3-py2
3237
# TODO: Use this when fixed instead of `opensuse-leap-42`
3338
# Ref: https://github.com/netmanagers/salt-image-builder/issues/2
3439
# - INSTANCE: default-opensuse-leap-15-2018-3-py2
3540
- INSTANCE: default-opensuse-leap-42-2018-3-py2
36-
- INSTANCE: default-debian-8-2017-7-py2
37-
- INSTANCE: default-ubuntu-1604-2017-7-py2
41+
# - INSTANCE: default-debian-8-2017-7-py2
42+
# - INSTANCE: default-ubuntu-1604-2017-7-py2
43+
# TODO: Enable after improving the formula to work with other than `systemd`
3844
- INSTANCE: default-centos-6-2017-7-py2
39-
- INSTANCE: default-fedora-28-2017-7-py2
40-
- INSTANCE: default-opensuse-leap-42-2017-7-py2
45+
# - INSTANCE: default-fedora-28-2017-7-py2
46+
# - INSTANCE: default-opensuse-leap-42-2017-7-py2
4147

4248
script:
4349
- sudo modprobe ip_vs

kitchen.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,39 @@ 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`
15+
- name: debian-9-develop-py3
16+
driver:
17+
image: netmanagers/salt-develop-py3:debian-9
18+
provision_command:
19+
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
20+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
21+
- name: ubuntu-1804-develop-py3
22+
driver:
23+
image: netmanagers/salt-develop-py3:ubuntu-18.04
24+
provision_command:
25+
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
26+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
27+
- name: centos-7-develop-py3
28+
driver:
29+
image: netmanagers/salt-develop-py3:centos-7
30+
provision_command:
31+
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
32+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
33+
- name: fedora-29-develop-py3
34+
driver:
35+
image: netmanagers/salt-develop-py3:fedora-29
36+
provision_command:
37+
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
38+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
39+
- name: opensuse-leap-15-develop-py3
40+
driver:
41+
image: netmanagers/salt-develop-py3:opensuse-leap-15
42+
provision_command:
43+
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
44+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
45+
run_command: /usr/lib/systemd/systemd
46+
1447
## SALT 2019.2
1548
- name: debian-9-2019-2-py3
1649
driver:

0 commit comments

Comments
 (0)