From patchwork Wed May 30 11:06:51 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: 137249 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp5173318lji; Wed, 30 May 2018 04:07:35 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKCGuKTO7hghG/nTpUEaINrCfHhawzj0NyX7t925zaCFB5ayb1dvkmgUXCastjDVmSz+B+L X-Received: by 2002:ac8:2753:: with SMTP id h19-v6mr1931723qth.185.1527678455285; Wed, 30 May 2018 04:07:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527678455; cv=none; d=google.com; s=arc-20160816; b=vOEsyxoYIRvrO8WbIySmwGtKh5VnTn5EckYZVb3wiqnDfCS4DKJy+ptxCPVXlC2P7/ dLvc9qidAHpwmf+pDntz4N26axLeYzeHcdmPvVM6m9EaKk0LkcgbgJAk8KjYVn9MjcWG 4eRvDFYiSMcsLXz3/o0ts5G8DzkOQ6RrDoG8MPC3+ufcSSd42sDUsHS5JbPgSv4Lke3S tsIL6dPQ+jwzpraiSkK8pFqMuOFSzdpwBj2c4twrpoUzWs52V74A0Y8jz5ZFOH9q5KcR DA+GTV96s5p2GSPOf/+12AF/xi+dJovSbL0LTI9DD5B6kkcL53eScRI+CS80XGBRUs78 ABPw== 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=G9fQkyt4fh95VeZkT5shDje3JQSC4uegA1LazwQyhtI=; b=BKzfSKF1g+TlNXkedjEi+r2ntEblosZjfikuHbd3qgRTgvVgrFSPIgRxaQukmsnqpV qiwL9JJ0GaAmvHrH7sRUPV2M6r5+Wbm21iEjvyJaLyzGtiy5sNE7ayV9ZsGlF+vQDx7n CTIk/ykH9UOGozSmLm8UioCARUFuMdRr8DDEbgniQ+Mon+TCjqRuF960MjnRaPM6U7+r dFpIjVEZlCEstZPBkmKnQ7h3tQHQnC53W5BubcdZ8y4R8IuCQS+NKPBSbF3LxSrfczl4 Su7Mi/XyBiAnGqtZ4QYu1SaFyIjaBZZCQBDYh8wV8cpQARLRbL9tdbr3aGvdQpXf2eTO urAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dk3/KvHh; 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 s50-v6si7081472qvs.140.2018.05.30.04.07.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 30 May 2018 04:07:35 -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=dk3/KvHh; 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]:37600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNyx4-0008R2-J8 for patch@linaro.org; Wed, 30 May 2018 07:07:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNywa-0008O3-7m for qemu-devel@nongnu.org; Wed, 30 May 2018 07:07:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNywY-0001yw-QM for qemu-devel@nongnu.org; Wed, 30 May 2018 07:07:04 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:38090) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fNywY-0001yZ-JO for qemu-devel@nongnu.org; Wed, 30 May 2018 07:07:02 -0400 Received: by mail-wm0-x230.google.com with SMTP id m129-v6so46809751wmb.3 for ; Wed, 30 May 2018 04:07:02 -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=G9fQkyt4fh95VeZkT5shDje3JQSC4uegA1LazwQyhtI=; b=dk3/KvHhQTUC/ZndXuJ7qETRY6uCVzVkn95zXQezoZY9qOoeaK17TReE26B8aqBd7S Nc0voyyx85UWCp2mKm4ZicO4pFivV59uf4F91iKubCKQneaYOnuQBYPl18IUQpDXEcXI OsTB7IY8xlLhUoK3bFMhAHvOXFXfBfJbr9vFY= 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=G9fQkyt4fh95VeZkT5shDje3JQSC4uegA1LazwQyhtI=; b=pR7oRBdFj+1uSf370Jv0YKOp03CNjhkmZzD+lQT0hb2Rf8clWALarYMwiE0U3Fn0Rd sS2TnUXMT/1R/pbp2IP+FVeIwaVNEv6ytobHLOHrhRh365oBlya90B/puZ+6jhHf5mcb NnVXCNONSe8fgW3opokmU0upL6SzWaSRHyukWxVnSOPUCX0xRzzAZCv6z/1a4Oootuii U8qNVozq9f31Z305w+hoqPZ5L6dcrJHCFtO8FQ/wVm2KDa4cOwE1hTDI1gsuK/n74hCV 4X9XatbCeqrtWYZC0BFXHPs4x3Rj5O8EPGqTVS8yfk1tDMA8EQMzC+SrqGchY3lA0hIl s/2g== X-Gm-Message-State: ALKqPwdgh5QVFKNj3KLWy3k/ZNNbzR8vsQ+1GmQ3nqullhj3IelbtYeM IcOrbyEt3FgDoRgQyB0V8wCkcg== X-Received: by 2002:a1c:15c3:: with SMTP id 186-v6mr1239200wmv.39.1527678421549; Wed, 30 May 2018 04:07:01 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e133-v6sm21610125wma.38.2018.05.30.04.06.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 04:06:58 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2C15B3E075B; Wed, 30 May 2018 12:06:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Wed, 30 May 2018 12:06:51 +0100 Message-Id: <20180530110655.22022-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530110655.22022-1-alex.bennee@linaro.org> References: <20180530110655.22022-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::230 Subject: [Qemu-devel] [PATCH v1 4/8] 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org 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 --- tests/docker/dockerfiles/travis.docker | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.17.0 Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker index 605b6e429b..6e90f033d5 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -1,8 +1,11 @@ -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 +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