From patchwork Mon Sep 28 18:36:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniele Di Proietto X-Patchwork-Id: 523559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id C5EB31400CB for ; Tue, 29 Sep 2015 04:37:05 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 8AC98102A8; Mon, 28 Sep 2015 11:37:04 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 4421D1028F for ; Mon, 28 Sep 2015 11:37:03 -0700 (PDT) Received: from bar2.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id AA0384205E7 for ; Mon, 28 Sep 2015 12:37:02 -0600 (MDT) X-ASG-Debug-ID: 1443465422-03dc537fe07f2030001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar2.cudamail.com with ESMTP id lbMkQJqXVClNGuNx (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 28 Sep 2015 12:37:02 -0600 (MDT) X-Barracuda-Envelope-From: diproiettod@vmware.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO smtp-outbound-2.vmware.com) (208.91.2.13) by mx1-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 28 Sep 2015 18:37:02 -0000 Received-SPF: pass (mx1-pf2.cudamail.com: SPF record at _spf.vmware.com designates 208.91.2.13 as permitted sender) X-Barracuda-Apparent-Source-IP: 208.91.2.13 X-Barracuda-RBL-IP: 208.91.2.13 Received: from sc9-mailhost1.vmware.com (sc9-mailhost1.vmware.com [10.113.161.71]) by smtp-outbound-2.vmware.com (Postfix) with ESMTP id EF078280F8; Mon, 28 Sep 2015 11:36:59 -0700 (PDT) Received: from diproiettod-dev.eng.vmware.com (unknown [10.20.208.183]) by sc9-mailhost1.vmware.com (Postfix) with ESMTP id EADA1189AF; Mon, 28 Sep 2015 11:36:58 -0700 (PDT) X-CudaMail-Envelope-Sender: diproiettod@vmware.com From: Daniele Di Proietto To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-927069496 X-CudaMail-DTE: 092815 X-CudaMail-Originating-IP: 208.91.2.13 Date: Mon, 28 Sep 2015 19:36:37 +0100 X-ASG-Orig-Subj: [##CM-E2-927069496##][RFC] travis: Use container infrastructure. Message-Id: <1443465397-4195-1-git-send-email-diproiettod@vmware.com> X-Mailer: git-send-email 2.1.4 X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1443465422 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-ASG-Whitelist: EmailCat (corporate) Subject: [ovs-dev] [RFC] travis: Use container infrastructure. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" 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 Tested-at: https://travis-ci.org/ddiproietto/ovs/builds/81764972 Signed-off-by: Daniele Di Proietto CC: Joe Stringer Acked-by: Ben Pfaff --- .travis.yml | 11 ++++++++++- .travis/prepare.sh | 9 +-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index c721f53..f3a9329 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,18 @@ compiler: - gcc - clang +addons: + apt: + packages: + - libssl-dev + - llvm-dev + - gcc-multilib + before_install: ./.travis/prepare.sh -sudo: true +before_script: export PATH=$PATH:$HOME/bin + +sudo: false env: - OPTS="--disable-ssl" 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 ..