diff options
| author | Adrian Reber <areber@redhat.com> | 2018-05-16 09:20:26 +0300 |
|---|---|---|
| committer | Pavel Emelyanov <xemul@virtuozzo.com> | 2018-07-09 18:25:16 +0300 |
| commit | 553dd546b5a895554d08d9f7cfb46d2cb090c494 (patch) | |
| tree | 7c880c95656fa88a946ad20f7165005c4395f59f /scripts/travis | |
| parent | 767534f10fcf0485dd58bf37156ace4cc59c35b7 (diff) | |
travis: fix python2 package installation
For python2/python3 compatibility install additional (python2-future)
and different (python2-ipaddress) packages during test.
Also switch Fedora tests to explicitly install versioned python packages
(python2-* instead of python-*).
Signed-off-by: Adrian Reber <areber@redhat.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Diffstat (limited to 'scripts/travis')
| -rwxr-xr-x | scripts/travis/travis-tests | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests index 17c8c231d..c642ae099 100755 --- a/scripts/travis/travis-tests +++ b/scripts/travis/travis-tests @@ -2,7 +2,7 @@ set -x -e TRAVIS_PKGS="protobuf-c-compiler libprotobuf-c0-dev libaio-dev - libprotobuf-dev protobuf-compiler python-ipaddr libcap-dev + libprotobuf-dev protobuf-compiler libcap-dev libnl-3-dev gcc-multilib gdb bash python-protobuf libnet-dev util-linux asciidoc xmlto libnl-route-3-dev" @@ -45,7 +45,9 @@ travis_prep () { apt-get update -qq apt-get install -qq --no-install-recommends $TRAVIS_PKGS - pip install junit-xml + # travis is based on 14.04 and that does not have python + # packages for future and ipaddress (16.04 has those packages) + pip install junit-xml future ipaddress chmod a+x $HOME } |