Skip to content

Commit fc0f5b6

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 7ee67ad commit fc0f5b6

File tree

2 files changed

+102
-9
lines changed

2 files changed

+102
-9
lines changed

.travis.yml

+22-6
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,34 @@ language: ruby
1111
services:
1212
- docker
1313

14-
before_install:
15-
- bundle install
16-
1714
# Make sure the instances listed below match up with
1815
# the `platforms` defined in `kitchen.yml`
1916
env:
2017
matrix:
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
2123
- INSTANCE: default-debian-9-2019-2-py3
2224
- INSTANCE: default-ubuntu-1804-2019-2-py3
23-
- INSTANCE: default-ubuntu-1604-2018-3-py2
25+
# - 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-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
2437
- 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
2542

2643
script:
2744
- bundle exec kitchen verify ${INSTANCE}
@@ -45,7 +62,7 @@ jobs:
4562
script:
4663
# Update `AUTHORS.md`
4764
- export MAINTAINER_TOKEN=${GH_TOKEN}
48-
- go get github.com/alxwr/maintainer
65+
- go get github.com/myii/maintainer
4966
- maintainer contributor
5067

5168
# Install all dependencies required for `semantic-release`
@@ -58,4 +75,3 @@ jobs:
5875
script:
5976
# Run `semantic-release`
6077
- npx semantic-release@15
61-

kitchen.yml

+80-3
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,100 @@ 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
1851
- name: ubuntu-1804-2019-2-py3
1952
driver:
20-
image: netmanagers/salt-2019.2-py3:ubuntu-1804
53+
image: netmanagers/salt-2019.2-py3:ubuntu-18.04
54+
- name: centos-7-2019-2-py3
55+
driver:
56+
image: netmanagers/salt-2019.2-py3:centos-7
57+
- name: fedora-29-2019-2-py3
58+
driver:
59+
image: netmanagers/salt-2019.2-py3:fedora-29
60+
- name: opensuse-leap-15-2019-2-py3
61+
driver:
62+
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
63+
run_command: /usr/lib/systemd/systemd
2164

2265
## SALT 2018.3
66+
- name: debian-9-2018-3-py2
67+
driver:
68+
image: netmanagers/salt-2018.3-py2:debian-9
2369
- name: ubuntu-1604-2018-3-py2
2470
driver:
25-
image: netmanagers/salt-2018.3-py2:ubuntu-1604
71+
image: netmanagers/salt-2018.3-py2:ubuntu-16.04
72+
- name: centos-7-2018-3-py2
73+
driver:
74+
image: netmanagers/salt-2018.3-py2:centos-7
75+
- name: fedora-29-2018-3-py2
76+
driver:
77+
image: netmanagers/salt-2018.3-py2:fedora-29
78+
# TODO: Use this when fixed instead of `opensuse-leap-42`
79+
# Ref: https://github.com/netmanagers/salt-image-builder/issues/2
80+
# - name: opensuse-leap-15-2018-3-py2
81+
# driver:
82+
# image: netmanagers/salt-2018.3-py2:opensuse-leap-15
83+
# run_command: /usr/lib/systemd/systemd
84+
- name: opensuse-leap-42-2018-3-py2
85+
driver:
86+
image: netmanagers/salt-2018.3-py2:opensuse-leap-42
87+
run_command: /usr/lib/systemd/systemd
2688

2789
## SALT 2017.7
90+
- name: debian-8-2017-7-py2
91+
driver:
92+
image: netmanagers/salt-2017.7-py2:debian-8
2893
- name: ubuntu-1604-2017-7-py2
2994
driver:
30-
image: netmanagers/salt-2017.7-py2:ubuntu-1604
95+
image: netmanagers/salt-2017.7-py2:ubuntu-16.04
96+
# TODO: Modify the formula to work for non-`systemd` platforms
97+
- name: centos-6-2017-7-py2
98+
driver:
99+
image: netmanagers/salt-2017.7-py2:centos-6
100+
run_command: /sbin/init
101+
- name: fedora-28-2017-7-py2
102+
driver:
103+
image: netmanagers/salt-2017.7-py2:fedora-28
104+
- name: opensuse-leap-42-2017-7-py2
105+
driver:
106+
image: netmanagers/salt-2017.7-py2:opensuse-leap-42
107+
run_command: /usr/lib/systemd/systemd
31108

32109
provisioner:
33110
name: salt_solo

0 commit comments

Comments
 (0)