[v1,03/23] docker: include python-yaml in travis.docker

Message ID	20170717144848.11793-4-alex.bennee@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org 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; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Mon, 17 Jul 2017 15:48:28 +0100 Message-Id: <20170717144848.11793-4-alex.bennee@linaro.org> In-Reply-To: <20170717144848.11793-1-alex.bennee@linaro.org> References: <20170717144848.11793-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v1 03/23] docker: include python-yaml in travis.docker Precedence: list Cc: Fam Zheng <famz@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	Current Travis Queue \| expand [v1,00/23] Current Travis Queue [v1,01/23] docker: allow customizing Travis global_env variables [v1,02/23] travis: move make -j flag out of script [v1,03/23] docker: include python-yaml in travis.docker [v1,04/23] docker: add debug tools to travis.docker [v1,05/23] docker: rename debian stable -> 9 (Stretch) [v1,06/23] docker: add pkg-config and python-minimal packages to debian base [v1,07/23] docker: debian/s390x no more in unstable, now available in Stretch [v1,08/23] docker: remove packages now dependent of qemu in Stretch [v1,09/23] docker: add debian/armel based on Stretch [v1,10/23] docker: add debian/ppc64el based on Stretch [v1,11/23] docker: add debian/amd64 based on Stretch [v1,12/23] docker: enable virgl to extend code coverage on amd64 [v1,13/23] docker: enable netmap to extend code coverage on amd64 [v1,14/23] docker: enable gcrypt to extend code coverage on amd64 [v1,15/23] docker: enable nettle to extend code coverage on arm64 [v1,16/23] shippable: add armel targets [v1,17/23] shippable: add ppc64el targets [v1,18/23] shippable: add x86_64 targets [v1,19/23] util/cacheinfo: add missing include (TEMP) [v1,20/23] docker: add 'apt-fake' script which generate fake debian packages [v1,21/23] docker: add qemu:debian-jessie based on outdated jessie release [v1,22/23] docker: add debian/powerpc based on Jessie [v1,23/23] shippable: add powerpc target

Message ID

20170717144848.11793-4-alex.bennee@linaro.org

State

Superseded

Headers

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; 
From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Date: Mon, 17 Jul 2017 15:48:28 +0100
Message-Id: <20170717144848.11793-4-alex.bennee@linaro.org>
In-Reply-To: <20170717144848.11793-1-alex.bennee@linaro.org>
References: <20170717144848.11793-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PATCH v1 03/23] docker: include python-yaml in
	travis.docker
Precedence: list
Cc: Fam Zheng <famz@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?=
	<alex.bennee@linaro.org>, 	qemu-devel@nongnu.org,
	=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

Current Travis Queue | expand

Commit Message

Alex Bennée July 17, 2017, 2:48 p.m. UTC

Although the upstream Travis images don't need this library our
"travis-lite" scripts are written in python. This allows us to do:

  make docker-travis@travis J=10

and approximate a travis run on their default image.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 tests/docker/dockerfiles/travis.docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.13.0

Comments

Fam Zheng July 17, 2017, 10:42 p.m. UTC | #1

On Mon, 07/17 15:48, Alex Bennée wrote:
> Although the upstream Travis images don't need this library our

> "travis-lite" scripts are written in python. This allows us to do:

> 

>   make docker-travis@travis J=10

> 

> and approximate a travis run on their default image.

> 

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>  tests/docker/dockerfiles/travis.docker | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker

> index e4983ae2d3..a315f66ad9 100644

> --- a/tests/docker/dockerfiles/travis.docker

> +++ b/tests/docker/dockerfiles/travis.docker

> @@ -2,5 +2,5 @@ FROM quay.io/travisci/travis-ruby

>  RUN apt-get update

>  RUN apt-get -y build-dep qemu

>  RUN apt-get -y build-dep device-tree-compiler

> -RUN apt-get -y install python2.7 dh-autoreconf

> +RUN apt-get -y install python2.7 python-yaml dh-autoreconf

>  ENV FEATURES pyyaml

> -- 

> 2.13.0

> 


BTW, is the real travis yaml parser open source?

Reviewed-by: Fam Zheng <famz@redhat.com>

diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker
index e4983ae2d3..a315f66ad9 100644
--- a/tests/docker/dockerfiles/travis.docker
+++ b/tests/docker/dockerfiles/travis.docker
@@ -2,5 +2,5 @@  FROM quay.io/travisci/travis-ruby
 RUN apt-get update
 RUN apt-get -y build-dep qemu
 RUN apt-get -y build-dep device-tree-compiler
-RUN apt-get -y install python2.7 dh-autoreconf
+RUN apt-get -y install python2.7 python-yaml dh-autoreconf
 ENV FEATURES pyyaml

[v1,03/23] docker: include python-yaml in travis.docker

Commit Message

Comments

Patch