From: Daniele Di Proietto <[email protected]>

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.

Tested-at: https://travis-ci.org/ddiproietto/ovs/builds/81764972

[back ported to branch-2.4 by azhou]

Signed-off-by: Daniele Di Proietto <[email protected]>
CC: Joe Stringer <[email protected]>
Acked-by: Ben Pfaff <[email protected]>
Signed-off-by:  Andy Zhou <[email protected]>
---
 .travis.yml        | 14 +++++++++++++-
 .travis/prepare.sh |  9 +--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3a84dfb..463622b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
@@ -26,4 +38,4 @@ script: ./.travis/build.sh $OPTS
 notifications:
   email:
     recipients:
-      - secure: 
KnZ6yDXDcC4VoiI04ZYR4sRTln7q16aXA7gVBa/M1jPWxl3BiTi+4idVE5bgrB1AK5iUwUXN6LQpjOdFDw1U/D+sKt+xmVG5MyLaTYIFp1TUOgtSGeiG3IUhpu125PN1i2EhXNqANyWyStCiISDvJkDe4D/tbBehip1AEBuQONk=
+      - [email protected]
diff --git a/.travis/prepare.sh b/.travis/prepare.sh
index 0fd6c28..cfc1b17 100755
--- a/.travis/prepare.sh
+++ b/.travis/prepare.sh
@@ -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 ..
-- 
1.9.1

_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev

Reply via email to