Skip to content

Commit 4af0301

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 7b05c9f commit 4af0301

File tree

2 files changed

+55
-17
lines changed

2 files changed

+55
-17
lines changed

.travis.yml

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,30 @@ services:
1515
# the `platforms` defined in `kitchen.yml`
1616
env:
1717
matrix:
18-
- INSTANCE: default-debian-9-2019-2-py3
18+
- INSTANCE: default-debian-9-develop-py3
19+
# - INSTANCE: default-ubuntu-1804-develop-py3
20+
# - INSTANCE: default-centos-7-develop-py3
21+
# - INSTANCE: default-fedora-29-develop-py3
22+
# - INSTANCE: default-opensuse-leap-15-develop-py3
23+
# - INSTANCE: default-debian-9-2019-2-py3
1924
- INSTANCE: default-ubuntu-1804-2019-2-py3
2025
- INSTANCE: default-centos-7-2019-2-py3
21-
- INSTANCE: default-fedora-29-2019-2-py3
22-
- INSTANCE: default-opensuse-leap-15-2019-2-py3
23-
# - INSTANCE: default-debian-9-2018-3-py2
24-
# - INSTANCE: default-ubuntu-1604-2018-3-py2
25-
# - INSTANCE: default-centos-7-2018-3-py2
26-
# - INSTANCE: default-fedora-29-2018-3-py2
27-
# # TODO: Use this when fixed instead of `opensuse-leap-42`
28-
# # Ref: https://github.com/netmanagers/salt-image-builder/issues/2
29-
# # - INSTANCE: default-opensuse-leap-15-2018-3-py2
30-
# - INSTANCE: default-opensuse-leap-42-2018-3-py2
31-
# - INSTANCE: default-debian-8-2017-7-py2
32-
# - INSTANCE: default-ubuntu-1604-2017-7-py2
33-
# # TODO: Enable after improving the formula to work with other than `systemd`
34-
# - INSTANCE: default-centos-6-2017-7-py2
35-
# - INSTANCE: default-fedora-28-2017-7-py2
36-
# - INSTANCE: default-opensuse-leap-42-2017-7-py2
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-2018-3-py2
32+
# TODO: Use this when fixed instead of `opensuse-leap-42`
33+
# Ref: https://github.com/netmanagers/salt-image-builder/issues/2
34+
# - INSTANCE: default-opensuse-leap-15-2018-3-py2
35+
- INSTANCE: default-opensuse-leap-42-2018-3-py2
36+
# - INSTANCE: default-debian-8-2017-7-py2
37+
# - INSTANCE: default-ubuntu-1604-2017-7-py2
38+
# TODO: Enable after improving the formula to work with other than `systemd`
39+
- INSTANCE: default-centos-6-2017-7-py2
40+
# - INSTANCE: default-fedora-28-2017-7-py2
41+
# - INSTANCE: default-opensuse-leap-42-2017-7-py2
3742

3843
script:
3944
- bundle exec kitchen verify ${INSTANCE}

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)