Skip to content

Commit 3f81439

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 44b8fb1 commit 3f81439

File tree

3 files changed

+59
-46
lines changed

3 files changed

+59
-46
lines changed

.travis.yml

+14-11
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,33 @@ 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+
# TODO: Re-enable this once the `systemd` service can be restarted reliably
20+
# - INSTANCE: default-ubuntu-1804-develop-py3
21+
# - INSTANCE: default-centos-7-develop-py3
22+
# - INSTANCE: default-fedora-29-develop-py3
23+
# - INSTANCE: default-opensuse-leap-15-develop-py3
24+
# - INSTANCE: default-debian-9-2019-2-py3
2225
# TODO: Re-enable this once the `systemd` service can be restarted reliably
2326
# - INSTANCE: default-ubuntu-1804-2019-2-py3
2427
- INSTANCE: default-centos-7-2019-2-py3
25-
# - INSTANCE: default-fedora-29-2019-2-py3
26-
- INSTANCE: default-opensuse-leap-15-2019-2-py3
28+
- INSTANCE: default-fedora-29-2019-2-py3
29+
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
2730
# - INSTANCE: default-debian-9-2018-3-py2
2831
- INSTANCE: default-ubuntu-1604-2018-3-py2
2932
# - INSTANCE: default-centos-7-2018-3-py2
30-
- INSTANCE: default-fedora-29-2018-3-py2
31-
# TODO: Use this when fixed instead of `opensuse-423`
32-
# NOTE: Having to temporarily disable `opensuse-423` due to slow mirror
33+
# - INSTANCE: default-fedora-29-2018-3-py2
34+
# TODO: Use this when fixed instead of `opensuse-leap-42`
35+
# Ref: https://github.com/netmanagers/salt-image-builder/issues/2
3336
# - INSTANCE: default-opensuse-leap-15-2018-3-py2
34-
# - INSTANCE: default-opensuse-423-2018-3-py2
37+
- INSTANCE: default-opensuse-leap-42-2018-3-py2
3538
# - INSTANCE: default-debian-8-2017-7-py2
3639
# - INSTANCE: default-ubuntu-1604-2017-7-py2
40+
# TODO: Enable after improving the formula to work with other than `systemd`
3741
- INSTANCE: default-centos-6-2017-7-py2
3842
# - INSTANCE: default-fedora-28-2017-7-py2
3943
# - INSTANCE: default-opensuse-leap-42-2017-7-py2
@@ -73,4 +77,3 @@ jobs:
7377
script:
7478
# Run `semantic-release`
7579
- npx semantic-release@15
76-

Gemfile.lock

-26
This file was deleted.

kitchen.yml

+45-9
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,41 @@ 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:
@@ -42,16 +77,17 @@ platforms:
4277
- name: fedora-29-2018-3-py2
4378
driver:
4479
image: netmanagers/salt-2018.3-py2:fedora-29
45-
# TODO: Use this when fixed instead of `opensuse-423`
46-
- name: opensuse-leap-15-2018-3-py2
47-
driver:
48-
image: netmanagers/salt-2018.3-py2:opensuse-leap-15
49-
run_command: /usr/lib/systemd/systemd
50-
- name: opensuse-423-2018-3-py2
51-
driver:
52-
image: netmanagers/salt-2018.3-py2:opensuse-423
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
83+
# driver:
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
5389
provision_command:
54-
- zypper refresh && zypper install -y net-tools
90+
- zypper refresh && zypper install -y python-pip
5591
run_command: /usr/lib/systemd/systemd
5692

5793
## SALT 2017.7

0 commit comments

Comments
 (0)