mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 22:05:36 +00:00
Code Issues Releases Wiki Activity

travis: fix python2 package installation

Browse Source 
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>
This commit is contained in:
Adrian Reber
2018-05-16 06:20:26 +00:00
committed by Pavel Emelyanov
parent 767534f10f
commit 553dd546b5
6 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/build/Dockerfile.alpine
View File

@@ -26,11 +26,12 @@ RUN mv .ccache /tmp && make mrproper && ccache -sz && \
RUN apk add \ RUN apk add \
py-yaml \ py-yaml \
py-pip \ py-pip \
py2-future \
ip6tables \ ip6tables \
iptables \ iptables \
iproute2 \ iproute2 \
tar \ tar \
bash bash
RUN pip install protobuf ipaddr RUN pip install protobuf ipaddress
RUN make -C test/zdtm RUN make -C test/zdtm

6
scripts/build/Dockerfile.centos
View File

@@ -22,9 +22,11 @@ RUN yum install -y \
protobuf-devel \ protobuf-devel \
protobuf-python \ protobuf-python \
python \ python \
python-ipaddr \ python-ipaddress \
python2-future \
python-yaml \ python-yaml \
tar tar \
which
COPY . /criu COPY . /criu
WORKDIR /criu WORKDIR /criu

12
scripts/build/Dockerfile.fedora.tmpl
View File

@@ -17,11 +17,15 @@ RUN dnf install -y \
procps-ng \ procps-ng \
protobuf-c-devel \ protobuf-c-devel \
protobuf-devel \ protobuf-devel \
protobuf-python \ python2-protobuf \
python \ python2 \
python-ipaddr \ # Starting with Fedora 28 this is python2-ipaddress
python-ipaddress \
# Starting with Fedora 28 this is python2-pyyaml
python-yaml \ python-yaml \
tar python2-future \
tar \
which
# Replace coreutils-single with "traditional" coreutils # Replace coreutils-single with "traditional" coreutils
# to fix the following error on Fedora 28/rawhide while # to fix the following error on Fedora 28/rawhide while

2
scripts/build/Dockerfile.s390x.hdr
View File

@@ -1,4 +1,4 @@
FROM s390x/debian:jessie FROM s390x/debian:jessie-backports
ENV QEMU_CPU z900 ENV QEMU_CPU z900
COPY scripts/build/qemu-user-static/usr/bin/qemu-s390x-static /usr/bin/qemu-s390x-static COPY scripts/build/qemu-user-static/usr/bin/qemu-s390x-static /usr/bin/qemu-s390x-static

3
scripts/build/Dockerfile.tmpl
View File

@@ -19,7 +19,8 @@ RUN apt-get update && apt-get install -y \
pkg-config \ pkg-config \
protobuf-c-compiler \ protobuf-c-compiler \
protobuf-compiler \ protobuf-compiler \
python-minimal python-minimal \
python-future
COPY . /criu COPY . /criu
WORKDIR /criu WORKDIR /criu

6
scripts/travis/travis-tests
View File

@@ -2,7 +2,7 @@
set -x -e set -x -e
TRAVIS_PKGS="protobuf-c-compiler libprotobuf-c0-dev libaio-dev 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 libnl-3-dev gcc-multilib gdb bash python-protobuf
libnet-dev util-linux asciidoc xmlto libnl-route-3-dev" libnet-dev util-linux asciidoc xmlto libnl-route-3-dev"
@@ -45,7 +45,9 @@ travis_prep () {
apt-get update -qq apt-get update -qq
apt-get install -qq --no-install-recommends $TRAVIS_PKGS 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 chmod a+x $HOME
} }