Skip to content

Commit 32b928a

Browse files
committed
ci(kitchen+travis): test fixed pre-salted images
1 parent 668f070 commit 32b928a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Diff for: .travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ before_install:
1919
env:
2020
matrix:
2121
- INSTANCE: default-debian-9-2019-2-py3
22-
# - INSTANCE: default-ubuntu-1804-2019-2-py3
22+
- INSTANCE: default-ubuntu-1804-2019-2-py3
2323
- INSTANCE: default-centos-7-2019-2-py3
2424
- INSTANCE: default-fedora-29-2019-2-py3
2525
- INSTANCE: default-opensuse-leap-15-2019-2-py3
@@ -28,7 +28,7 @@ env:
2828
- INSTANCE: default-centos-7-2018-3-py2
2929
- INSTANCE: default-fedora-29-2018-3-py2
3030
# TODO: Use this when fixed instead of `opensuse-423`
31-
# - INSTANCE: default-opensuse-leap-15-2018-3-py2
31+
- INSTANCE: default-opensuse-leap-15-2018-3-py2
3232
- INSTANCE: default-opensuse-423-2018-3-py2
3333
- INSTANCE: default-debian-8-2017-7-py2
3434
- INSTANCE: default-ubuntu-1604-2017-7-py2

Diff for: kitchen.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ platforms:
4343
driver:
4444
image: netmanagers/salt-2018.3-py2:fedora-29
4545
# 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
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
5050
- name: opensuse-423-2018-3-py2
5151
driver:
5252
image: netmanagers/salt-2018.3-py2:opensuse-423
@@ -64,7 +64,7 @@ platforms:
6464
- name: centos-6-2017-7-py2
6565
driver:
6666
image: netmanagers/salt-2017.7-py2:centos-6
67-
run_options: '--entrypoint /sbin/init'
67+
run_command: /sbin/init
6868
- name: fedora-28-2017-7-py2
6969
driver:
7070
image: netmanagers/salt-2017.7-py2:fedora-28

0 commit comments

Comments
 (0)