Skip to content

Commit f6b357d

Browse files
myiimyii
committed
ci(kitchen+travis): modify matrix to include develop platform
* Use balanced matrix based on `template-formula` guidelines
1 parent ae69ee4 commit f6b357d

File tree

2 files changed

+96
-40
lines changed

2 files changed

+96
-40
lines changed

Diff for: ‎.travis.yml

+23-13
Original file line numberDiff line numberDiff line change
@@ -11,23 +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:
21-
- 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
2224
- INSTANCE: default-ubuntu-1804-2019-2-py3
23-
- INSTANCE: default-centos-7-2019-2-py2
24-
- INSTANCE: default-fedora-29-2019-2-py2
25-
- INSTANCE: default-opensuse-423-2018-3-py2
26-
- INSTANCE: default-debian-8-2018-3-py2
27-
- INSTANCE: default-ubuntu-1604-2018-3-py2
28-
- INSTANCE: default-fedora-28-2018-3-py2
29-
- INSTANCE: default-debian-8-2017-7-py2
30-
- INSTANCE: default-ubuntu-1604-2017-7-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
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
3142

3243
script:
3344
- bundle exec kitchen verify ${INSTANCE}
@@ -64,4 +75,3 @@ jobs:
6475
script:
6576
# Run `semantic-release`
6677
- npx semantic-release@15
67-

Diff for: ‎kitchen.yml

+73-27
Original file line numberDiff line numberDiff line change
@@ -11,54 +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
21-
- name: centos-7-2019-2-py2
53+
image: netmanagers/salt-2019.2-py3:ubuntu-18.04
54+
- name: centos-7-2019-2-py3
2255
driver:
23-
image: netmanagers/salt-2019.2-py2:centos-7
24-
- name: fedora-29-2019-2-py2
56+
image: netmanagers/salt-2019.2-py3:centos-7
57+
- name: fedora-29-2019-2-py3
2558
driver:
26-
image: netmanagers/salt-2019.2-py2:fedora-29
27-
28-
## SALT 2018.3
29-
- name: opensuse-423-2018-3-py2
59+
image: netmanagers/salt-2019.2-py3:fedora-29
60+
- name: opensuse-leap-15-2019-2-py3
3061
driver:
31-
image: netmanagers/salt-2018.3-py2:opensuse-423
62+
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
3263
run_command: /usr/lib/systemd/systemd
33-
- name: debian-8-2018-3-py2
64+
65+
## SALT 2018.3
66+
- name: debian-9-2018-3-py2
3467
driver:
35-
image: netmanagers/salt-2018.3-py2:debian-8
68+
image: netmanagers/salt-2018.3-py2:debian-9
3669
- name: ubuntu-1604-2018-3-py2
3770
driver:
38-
image: netmanagers/salt-2018.3-py2:ubuntu-1604
39-
- name: fedora-28-2018-3-py2
71+
image: netmanagers/salt-2018.3-py2:ubuntu-16.04
72+
- name: centos-7-2018-3-py2
4073
driver:
41-
image: netmanagers/salt-2018.3-py2:fedora-28
42-
43-
# centos-6 guest fails on Debian hosts due to vsyscall issues, see
44-
# https://hub.docker.com/_/centos, "A note about vsyscall"
45-
# Disabled for `template-formula` because not `systemd` based
46-
# - name: centos-6-2018-3
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
4781
# driver:
48-
# image: netmanagers/salt-2018.3-py2:centos-6
49-
# run_command: /sbin/init
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
5088

51-
##S SALT 2017.7
89+
## SALT 2017.7
5290
- name: debian-8-2017-7-py2
5391
driver:
5492
image: netmanagers/salt-2017.7-py2:debian-8
5593
- name: ubuntu-1604-2017-7-py2
5694
driver:
57-
image: netmanagers/salt-2017.7-py2:ubuntu-1604
58-
# - name: centos-6-2017-7
59-
# driver:
60-
# image: netmanagers/salt-2017.7-py2:centos-6
61-
# run_command: /sbin/init
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
62108

63109
provisioner:
64110
name: salt_solo

0 commit comments

Comments
 (0)