File tree 2 files changed +7
-7
lines changed
test/integration/default/controls 2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change 1
- dist : xenial
2
1
stages :
3
2
- test
4
3
- commitlint
33
32
# - INSTANCE: default-fedora-29-develop-py3
34
33
# - INSTANCE: default-opensuse-leap-15-develop-py3
35
34
# - INSTANCE: default-debian-9-2019-2-py3
36
- - INSTANCE : deb -ubuntu-1804-2019-2-py3
35
+ - INSTANCE : ubu18 -ubuntu-1804-2019-2-py3
37
36
- INSTANCE : rpm-centos-7-2019-2-py3
38
37
# - INSTANCE: default-fedora-29-2019-2-py3
39
38
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
40
39
# - INSTANCE: default-debian-9-2018-3-py2
41
40
# - INSTANCE: default-ubuntu-1604-2018-3-py2
42
41
# - INSTANCE: default-centos-7-2018-3-py2
43
- - INSTANCE : rpm -fedora-29-2018-3-py2
42
+ - INSTANCE : fed -fedora-29-2018-3-py2
44
43
# TODO: Use this when fixed instead of `opensuse-leap-42`
45
44
# Ref: https://github.com/netmanagers/salt-image-builder/issues/2
46
45
# - INSTANCE: default-opensuse-leap-15-2018-3-py2
47
- - INSTANCE : rpm -opensuse-leap-42-2018-3-py2
46
+ - INSTANCE : sus -opensuse-leap-42-2018-3-py2
48
47
# - INSTANCE: default-debian-8-2017-7-py2
49
48
# - INSTANCE: default-ubuntu-1604-2017-7-py2
50
49
# TODO: Enable after improving the formula to work with other than `systemd`
Original file line number Diff line number Diff line change 1
1
# On some OSes+py3, /usr/bin/pip3 does not have a /usr/bin/pip link/file
2
2
# and Inspec fails to correctly find the pip binary.
3
- # As there's no py2/py3 separate tools, this hack let's us overcome the issue
4
-
5
- if ( File . exist? ( '/usr/bin/pip3' ) )
3
+ # We can probably pass the suite's name as an attribute to inspec
4
+ # but can't find how to do that so this flaky hack let's us overcome the issue
5
+ # Please, please please, feel free to improve it :)
6
+ if command ( '/usr/bin/pip3' ) . exist?
6
7
pip_binary = '/usr/bin/pip3'
7
8
else
8
9
pip_binary = '/usr/bin/pip'
You can’t perform that action at this time.
0 commit comments