Skip to content

Commit

Permalink
travis: Use container infrastructure.
Browse files Browse the repository at this point in the history
Recently some testcases have been failing in travis because of a warning
related to the use of an L3 device (OpenVZ specific) inside the workers.

To get travis tests working again we can move to the newer container
infrastructure: this commit does that.

The disadvantage is that there's no sudo access anymore, but we can
install packages with the apt plugin, and we shouldn't use root for
anything else

Also, since we're building DPDK with vhost-user (not vhost-cuse),
libfuse-dev is not needed anymore.

[back ported to branch-2.4 by azhou.ovn.org]
Upstream: e88b97c

branch-2.4 travis builds are broken due to travis-ci infrastructure
changes. Move to use the newer container infrastructure to
restore builds. Note, libfuse-dev is required for branch-2.4 builds.

Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
CC: Joe Stringer <joestringer@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Signed-off-by:  Andy Zhou <azhou@ovn.org>
  • Loading branch information
ddiproietto authored and azhou-nicira committed Mar 11, 2016
1 parent 02c0dda commit a0de50d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
12 changes: 12 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,20 @@ compiler:
- gcc
- clang

addons:
apt:
packages:
- libssl-dev
- llvm-dev
- gcc-multilib
- libfuse-dev

before_install: ./.travis/prepare.sh

before_script: export PATH=$PATH:$HOME/bin

sudo: false

env:
- OPTS="--disable-ssl"
- TESTSUITE=1 KERNEL=3.18.1
Expand Down
9 changes: 1 addition & 8 deletions .travis/prepare.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
#!/bin/bash

sudo -E apt-get update -qq
sudo -E apt-get install -qq libssl-dev llvm-dev
sudo -E apt-get install -qq gcc-multilib
if [ "$DPDK" ]; then
sudo -E apt-get install -qq libfuse-dev
fi

git clone git://git.kernel.org/pub/scm/devel/sparse/chrisl/sparse.git
cd sparse && make && sudo -E make install PREFIX=/usr && cd ..
cd sparse && make && make install && cd ..

0 comments on commit a0de50d

Please sign in to comment.