Skip to content

Commit 6fde660

Browse files
committed
ci(travis): change python version test to a way travis likes
1 parent d82ba73 commit 6fde660

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
dist: xenial
21
stages:
32
- test
43
- commitlint
@@ -33,18 +32,18 @@ env:
3332
# - INSTANCE: default-fedora-29-develop-py3
3433
# - INSTANCE: default-opensuse-leap-15-develop-py3
3534
# - INSTANCE: default-debian-9-2019-2-py3
36-
- INSTANCE: deb-ubuntu-1804-2019-2-py3
35+
- INSTANCE: ubu18-ubuntu-1804-2019-2-py3
3736
- INSTANCE: rpm-centos-7-2019-2-py3
3837
# - INSTANCE: default-fedora-29-2019-2-py3
3938
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
4039
# - INSTANCE: default-debian-9-2018-3-py2
4140
# - INSTANCE: default-ubuntu-1604-2018-3-py2
4241
# - INSTANCE: default-centos-7-2018-3-py2
43-
- INSTANCE: rpm-fedora-29-2018-3-py2
42+
- INSTANCE: fed-fedora-29-2018-3-py2
4443
# TODO: Use this when fixed instead of `opensuse-leap-42`
4544
# Ref: https://github.com/netmanagers/salt-image-builder/issues/2
4645
# - 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
4847
# - INSTANCE: default-debian-8-2017-7-py2
4948
# - INSTANCE: default-ubuntu-1604-2017-7-py2
5049
# TODO: Enable after improving the formula to work with other than `systemd`

test/integration/default/controls/pips_spec.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# On some OSes+py3, /usr/bin/pip3 does not have a /usr/bin/pip link/file
22
# 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?
67
pip_binary = '/usr/bin/pip3'
78
else
89
pip_binary = '/usr/bin/pip'

0 commit comments

Comments
 (0)