From patchwork Fri Jun 1 16:20:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 137549 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1144284lji; Fri, 1 Jun 2018 09:21:33 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJTcCseMOhZBR7Rcx44n9IMfNXfZpDAXzseNGEAzpDW2B3Y3tIkdT3lb9MFpZYQgRgb2aX7 X-Received: by 2002:a37:9602:: with SMTP id y2-v6mr3120765qkd.295.1527870093655; Fri, 01 Jun 2018 09:21:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527870093; cv=none; d=google.com; s=arc-20160816; b=B+aJR1YCZaVjQq1VZbWoB/C+jjMPpo4GFIgWGyi5Bvj7QaUDCtTlM5VCWfREBzfH/D kN9JRc90w1/g4EMLbyH+tLyn3YIMT7bdphUJ2dRs+mKTyhQtlUasMLCS07NsisTaDedb jnK2a6J5AhHGmvx+7thN1xQHSmAsz/K2IOWuiXCl4HGXUDZQw/k9U4SFFRVzUDNCxPMu cPI6cpKUlIvXZPpCLayaZdyMTsrMHjwjwGEnOF4v3ZQGu7ITVW9BOzAr+JBvd0xLALM5 I5B4MZmgw5wad6PV7bOS3n3q85KOziSkFW9Q6UOpIAn0TkVvTr5cuNXSVV/zeZBbQrmn BwNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=77ZOxWc9Gyj9168gPwLW44QXKnH+xdWFrCZIv8nlwI4=; b=ISNzm9JzuX30thYW3ztmqkznD0B7ZIOlaR0SAAfu4zkdc1LeKilmsHgXvpz4myXMU6 jtJoEL2+Pdi+2snTvOl6UR0vvtoebrsnVQWyegWnEKlgZiPaoS98VqfuwdFcQhkftmvq gUWem5JqbYu504xQwXTkpfc/6Wl/JQBMbb9d3XufQ4ktoYs93omjyaRVA/HXifjzRGKq +JFNl5HWGmtvlHczgjoGLbmzR+Gl3X4AO0WRZM5gbesdHXqKdOndGQsLIh2Qfb3A+hB2 FruaHuQ+dmu1vzrpJ5lQ3blqOsY1QDr1QTavh6fZ2wAT41VUPf20LQsyezVTwMdN6r1b JtPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=O0VvwKy6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x9-v6si1649840qvh.260.2018.06.01.09.21.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Jun 2018 09:21:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=O0VvwKy6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmo1-0005rH-1V for patch@linaro.org; Fri, 01 Jun 2018 12:21:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmnd-0005qf-Do for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOmnc-0003oo-4h for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:09 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:56090) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fOmnb-0003o0-UW for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:08 -0400 Received: by mail-wm0-x22c.google.com with SMTP id a8-v6so4056922wmg.5 for ; Fri, 01 Jun 2018 09:21:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=77ZOxWc9Gyj9168gPwLW44QXKnH+xdWFrCZIv8nlwI4=; b=O0VvwKy6VHn3AIBlhr/fAmMlE8CiTnMJONVsKLTErRPfJHE3m+d9vVQjTMoZ5SBxuw VOK9buLUK7FFBsVKnl/Pj8jqpSjydvCWVBcj97CqzR3DKF9f0XWupeRSH3k+xE3nH9nw nRTpvKpB1BdiMbIL+dNVNB5e8b/5xytYgtCHU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=77ZOxWc9Gyj9168gPwLW44QXKnH+xdWFrCZIv8nlwI4=; b=PmAJEuzi8j6KTjHxFJgT+Jr3q9Unm7tdPHJ2w1EXNhaE6g3l1ZMSuVf6i7rQAGCCaM 5iRxNXcFq3iZYX+WXXcCiNpg8UACUMKWfo5qMzlNv69Xgteke6lInTFEht0nYtNaHyIj pNsOPt0OGff9mknJjuWG2O93NX/LeondI8cTae4uJgZfzpZGsuG2kxN7xwAb5cV/S5rn JZAceIk12TZnDPpFejnIPjivx3b4fAtj3b9gxNHs46sq6o5wvk3UK3LT3F0drSQdVFWN 7/b4YsWhLeLwprkXtd9hdyUiE85+O9RNPXBuZ2TW47IFuLpUmQ5IKP0QTzNzx2+HKCbV yESQ== X-Gm-Message-State: APt69E3y8cuYBAKx+2mT96xRMT+mz5aS5POB172koksaR89ds5f+Xnpz k/EExTBo97kPkERP0vEt0MT6zQ== X-Received: by 2002:a1c:5ec9:: with SMTP id s192-v6mr2976240wmb.54.1527870066866; Fri, 01 Jun 2018 09:21:06 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o12-v6sm56845304wrf.30.2018.06.01.09.21.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Jun 2018 09:21:04 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 25E103E0703; Fri, 1 Jun 2018 17:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 1 Jun 2018 17:20:58 +0100 Message-Id: <20180601162101.895-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601162101.895-1-alex.bennee@linaro.org> References: <20180601162101.895-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22c Subject: [Qemu-devel] [PULL 4/7] docker: update Travis docker image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is still poorly documented by Travis but according to: https://docs.travis-ci.com/user/common-build-problems/#Running-a-Container-Based-Docker-Image-Locally their reference images are now hosted on Docker Hub. So we update the FROM line to refer to the new default image. We also need a few additional tweaks: - re-enable deb-src lines for our build-dep install - add explicit PATH definition for tools - force the build USER to be Travis - add clang to FEATURES for our test-clang machinery Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé -- 2.17.0 diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker index 605b6e429b..c5ad39b533 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -1,8 +1,13 @@ -FROM quay.io/travisci/travis-ruby +FROM travisci/ci-garnet:packer-1512502276-986baf0 ENV DEBIAN_FRONTEND noninteractive ENV LANG en_US.UTF-8 ENV LC_ALL en_US.UTF-8 +RUN cat /etc/apt/sources.list | sed "s/# deb-src/deb-src/" >> /etc/apt/sources.list RUN apt-get update RUN apt-get -y build-dep qemu RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools -ENV FEATURES pyyaml +# Travis tools require PhantomJS / Neo4j / Maven accessible +# in their PATH (QEMU build won't access them). +ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +ENV FEATURES clang pyyaml +USER travis