Skip to content

Commit 7b7aadc

Browse files
committed
ci(kitchen+travis): use newly available pre-salted images
1 parent 3c53684 commit 7b7aadc

File tree

2 files changed

+57
-22
lines changed

2 files changed

+57
-22
lines changed

.travis.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,24 @@ before_install:
1919
env:
2020
matrix:
2121
- INSTANCE: default-debian-9-2019-2-py3
22-
- 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
22+
# TODO: Re-enable this once the `systemd` service can be restarted reliably
23+
# - INSTANCE: default-ubuntu-1804-2019-2-py3
24+
- INSTANCE: default-centos-7-2019-2-py3
25+
- INSTANCE: default-fedora-29-2019-2-py3
26+
- INSTANCE: default-opensuse-leap-15-2019-2-py3
27+
- INSTANCE: default-debian-9-2018-3-py2
2728
- INSTANCE: default-ubuntu-1604-2018-3-py2
28-
- INSTANCE: default-fedora-28-2018-3-py2
29+
- 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-opensuse-leap-15-2018-3-py2
34+
# - INSTANCE: default-opensuse-423-2018-3-py2
2935
- INSTANCE: default-debian-8-2017-7-py2
3036
- INSTANCE: default-ubuntu-1604-2017-7-py2
37+
# - INSTANCE: default-centos-7-2017-7-py2
38+
- INSTANCE: default-fedora-28-2017-7-py2
39+
- INSTANCE: default-opensuse-leap-42-2017-7-py2
3140

3241
script:
3342
- bundle exec kitchen verify ${INSTANCE}

kitchen.yml

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,42 @@ platforms:
1717
image: netmanagers/salt-2019.2-py3:debian-9
1818
- name: ubuntu-1804-2019-2-py3
1919
driver:
20-
image: netmanagers/salt-2019.2-py3:ubuntu-1804
21-
- name: centos-7-2019-2-py2
20+
image: netmanagers/salt-2019.2-py3:ubuntu-18.04
21+
- name: centos-7-2019-2-py3
2222
driver:
23-
image: netmanagers/salt-2019.2-py2:centos-7
24-
- name: fedora-29-2019-2-py2
23+
image: netmanagers/salt-2019.2-py3:centos-7
24+
- name: fedora-29-2019-2-py3
2525
driver:
26-
image: netmanagers/salt-2019.2-py2:fedora-29
27-
28-
## SALT 2018.3
29-
- name: opensuse-423-2018-3-py2
26+
image: netmanagers/salt-2019.2-py3:fedora-29
27+
- name: opensuse-leap-15-2019-2-py3
3028
driver:
31-
image: netmanagers/salt-2018.3-py2:opensuse-423
29+
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
3230
run_command: /usr/lib/systemd/systemd
33-
- name: debian-8-2018-3-py2
31+
32+
## SALT 2018.3
33+
- name: debian-9-2018-3-py2
3434
driver:
35-
image: netmanagers/salt-2018.3-py2:debian-8
35+
image: netmanagers/salt-2018.3-py2:debian-9
3636
- name: ubuntu-1604-2018-3-py2
3737
driver:
38-
image: netmanagers/salt-2018.3-py2:ubuntu-1604
39-
- name: fedora-28-2018-3-py2
38+
image: netmanagers/salt-2018.3-py2:ubuntu-16.04
39+
- name: centos-7-2018-3-py2
4040
driver:
41-
image: netmanagers/salt-2018.3-py2:fedora-28
42-
41+
image: netmanagers/salt-2018.3-py2:centos-7
42+
- name: fedora-29-2018-3-py2
43+
driver:
44+
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
53+
provision_command:
54+
- zypper refresh && zypper install -y net-tools
55+
run_command: /usr/lib/systemd/systemd
4356
# centos-6 guest fails on Debian hosts due to vsyscall issues, see
4457
# https://hub.docker.com/_/centos, "A note about vsyscall"
4558
# Disabled for `template-formula` because not `systemd` based
@@ -54,7 +67,20 @@ platforms:
5467
image: netmanagers/salt-2017.7-py2:debian-8
5568
- name: ubuntu-1604-2017-7-py2
5669
driver:
57-
image: netmanagers/salt-2017.7-py2:ubuntu-1604
70+
image: netmanagers/salt-2017.7-py2:ubuntu-16.04
71+
- name: centos-6-2017-7-py2
72+
driver:
73+
image: netmanagers/salt-2017.7-py2:centos-6
74+
run_command: /sbin/init
75+
- name: fedora-28-2017-7-py2
76+
driver:
77+
image: netmanagers/salt-2017.7-py2:fedora-28
78+
- name: opensuse-leap-42-2017-7-py2
79+
driver:
80+
image: netmanagers/salt-2017.7-py2:opensuse-leap-42
81+
provision_command:
82+
- zypper refresh && zypper install -y python-pip
83+
run_command: /usr/lib/systemd/systemd
5884
# - name: centos-6-2017-7
5985
# driver:
6086
# image: netmanagers/salt-2017.7-py2:centos-6

0 commit comments

Comments
 (0)