Skip to content

Commit 8699e9d

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 c3ec70e commit 8699e9d

File tree

2 files changed

+45
-19
lines changed

2 files changed

+45
-19
lines changed

.travis.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,27 @@ 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
26+
# - INSTANCE: default-fedora-29-2019-2-py3
27+
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
2328
# - INSTANCE: default-debian-9-2018-3-py2
2429
# - INSTANCE: default-ubuntu-1604-2018-3-py2
2530
# - INSTANCE: default-centos-7-2018-3-py2
26-
# - INSTANCE: default-fedora-29-2018-3-py2
31+
- INSTANCE: default-fedora-29-2018-3-py2
2732
# TODO: Use this when fixed instead of `opensuse-leap-42`
2833
# Ref: https://github.com/netmanagers/salt-image-builder/issues/2
2934
# - 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
35+
- INSTANCE: default-opensuse-leap-42-2018-3-py2
36+
- INSTANCE: default-debian-8-2017-7-py2
3237
# - INSTANCE: default-ubuntu-1604-2017-7-py2
38+
# TODO: Enable after improving the formula to work with other than `systemd`
3339
# - INSTANCE: default-centos-6-2017-7-py2
3440
# - INSTANCE: default-fedora-28-2017-7-py2
3541
# - INSTANCE: default-opensuse-leap-42-2017-7-py2

kitchen.yml

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,43 @@ 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:
1750
image: netmanagers/salt-2019.2-py3:debian-9
18-
provision_command:
19-
- apt-get update && apt-get install -y locales
20-
- echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
21-
- locale-gen en_US.UTF-8
2251
- name: ubuntu-1804-2019-2-py3
2352
driver:
2453
image: netmanagers/salt-2019.2-py3:ubuntu-18.04
@@ -37,10 +66,6 @@ platforms:
3766
- name: debian-9-2018-3-py2
3867
driver:
3968
image: netmanagers/salt-2018.3-py2:debian-9
40-
provision_command:
41-
- apt-get update && apt-get install -y locales
42-
- echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
43-
- locale-gen en_US.UTF-8
4469
- name: ubuntu-1604-2018-3-py2
4570
driver:
4671
image: netmanagers/salt-2018.3-py2:ubuntu-16.04
@@ -65,18 +90,13 @@ platforms:
6590
- name: debian-8-2017-7-py2
6691
driver:
6792
image: netmanagers/salt-2017.7-py2:debian-8
68-
provision_command:
69-
- apt-get update && apt-get install -y locales
70-
- echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
71-
- locale-gen en_US.UTF-8
7293
- name: ubuntu-1604-2017-7-py2
7394
driver:
7495
image: netmanagers/salt-2017.7-py2:ubuntu-16.04
7596
- name: centos-6-2017-7-py2
7697
driver:
7798
image: netmanagers/salt-2017.7-py2:centos-6
7899
run_command: /sbin/init
79-
run_options: -v /lib/modules:/lib/modules:ro
80100
- name: fedora-28-2017-7-py2
81101
driver:
82102
image: netmanagers/salt-2017.7-py2:fedora-28

0 commit comments

Comments
 (0)