Skip to content

Commit ecda7e6

Browse files
myiimyii
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 606458b commit ecda7e6

File tree

2 files changed

+102
-41
lines changed

2 files changed

+102
-41
lines changed

‎.travis.yml‎

Lines changed: 23 additions & 13 deletions
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-

‎kitchen.yml‎

Lines changed: 79 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,55 +11,106 @@ 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+
- apt-get update && apt-get install -y python3-pip
20+
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
21+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
22+
- name: ubuntu-1804-develop-py3
23+
driver:
24+
image: netmanagers/salt-develop-py3:ubuntu-18.04
25+
provision_command:
26+
- apt-get update && apt-get install -y python3-pip
27+
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
28+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
29+
- name: centos-7-develop-py3
30+
driver:
31+
image: netmanagers/salt-develop-py3:centos-7
32+
provision_command:
33+
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
34+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
35+
- name: fedora-29-develop-py3
36+
driver:
37+
image: netmanagers/salt-develop-py3:fedora-29
38+
provision_command:
39+
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
40+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
41+
- name: opensuse-leap-15-develop-py3
42+
driver:
43+
image: netmanagers/salt-develop-py3:opensuse-leap-15
44+
provision_command:
45+
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
46+
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
47+
run_command: /usr/lib/systemd/systemd
48+
1449
## SALT 2019.2
1550
- name: debian-9-2019-2-py3
1651
driver:
1752
image: netmanagers/salt-2019.2-py3:debian-9
1853
- name: ubuntu-1804-2019-2-py3
1954
driver:
20-
image: netmanagers/salt-2019.2-py3:ubuntu-1804
21-
- name: centos-7-2019-2-py2
55+
image: netmanagers/salt-2019.2-py3:ubuntu-18.04
56+
- name: centos-7-2019-2-py3
2257
driver:
23-
image: netmanagers/salt-2019.2-py2:centos-7
24-
- name: fedora-29-2019-2-py2
58+
image: netmanagers/salt-2019.2-py3:centos-7
59+
- name: fedora-29-2019-2-py3
2560
driver:
26-
image: netmanagers/salt-2019.2-py2:fedora-29
27-
28-
## SALT 2018.3
29-
- name: opensuse-423-2018-3-py2
61+
image: netmanagers/salt-2019.2-py3:fedora-29
62+
- name: opensuse-leap-15-2019-2-py3
3063
driver:
31-
image: netmanagers/salt-2018.3-py2:opensuse-423
64+
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
3265
run_command: /usr/lib/systemd/systemd
33-
- name: debian-8-2018-3-py2
66+
67+
## SALT 2018.3
68+
- name: debian-9-2018-3-py2
3469
driver:
35-
image: netmanagers/salt-2018.3-py2:debian-8
70+
image: netmanagers/salt-2018.3-py2:debian-9
3671
- name: ubuntu-1604-2018-3-py2
3772
driver:
38-
image: netmanagers/salt-2018.3-py2:ubuntu-1604
39-
- name: fedora-28-2018-3-py2
73+
image: netmanagers/salt-2018.3-py2:ubuntu-16.04
74+
- name: centos-7-2018-3-py2
4075
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
76+
image: netmanagers/salt-2018.3-py2:centos-7
77+
- name: fedora-29-2018-3-py2
78+
driver:
79+
image: netmanagers/salt-2018.3-py2:fedora-29
80+
# TODO: Use this when fixed instead of `opensuse-leap-42`
81+
# Ref: https://github.com/netmanagers/salt-image-builder/issues/2
82+
# - name: opensuse-leap-15-2018-3-py2
4783
# driver:
48-
# image: netmanagers/salt-2018.3-py2:centos-6
49-
# run_command: /sbin/init
84+
# image: netmanagers/salt-2018.3-py2:opensuse-leap-15
85+
# run_command: /usr/lib/systemd/systemd
86+
- name: opensuse-leap-42-2018-3-py2
87+
driver:
88+
image: netmanagers/salt-2018.3-py2:opensuse-leap-42
89+
provision_command:
90+
- zypper refresh && zypper install -y python-pip
91+
run_command: /usr/lib/systemd/systemd
5092

51-
##S SALT 2017.7
93+
## SALT 2017.7
5294
- name: debian-8-2017-7-py2
5395
driver:
5496
image: netmanagers/salt-2017.7-py2:debian-8
5597
- name: ubuntu-1604-2017-7-py2
5698
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
62-
99+
image: netmanagers/salt-2017.7-py2:ubuntu-16.04
100+
# TODO: Modify the formula to work for non-`systemd` platforms
101+
- name: centos-6-2017-7-py2
102+
driver:
103+
image: netmanagers/salt-2017.7-py2:centos-6
104+
run_command: /sbin/init
105+
- name: fedora-28-2017-7-py2
106+
driver:
107+
image: netmanagers/salt-2017.7-py2:fedora-28
108+
- name: opensuse-leap-42-2017-7-py2
109+
driver:
110+
image: netmanagers/salt-2017.7-py2:opensuse-leap-42
111+
provision_command:
112+
- zypper refresh && zypper install -y python-pip
113+
run_command: /usr/lib/systemd/systemd
63114
provisioner:
64115
name: salt_solo
65116
log_level: info

0 commit comments

Comments
 (0)