[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 01/31] docker: allow customizing Travis global_en
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v2 01/31] docker: allow customizing Travis global_env variables |
Date: |
Mon, 17 Jul 2017 21:31:29 -0300 |
From: Paolo Bonzini <address@hidden>
This is useful so that we can do builds at higher than -j3 when running
travis.py locally.
Signed-off-by: Paolo Bonzini <address@hidden>
---
tests/docker/travis.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/docker/travis.py b/tests/docker/travis.py
index 8dcc964da4..703a7fde85 100755
--- a/tests/docker/travis.py
+++ b/tests/docker/travis.py
@@ -21,13 +21,12 @@ def load_yaml(fname):
def conf_iter(conf):
def env_to_list(env):
return env if isinstance(env, list) else [env]
- global_env = conf["env"]["global"]
for entry in conf["matrix"]["include"]:
- yield {"env": global_env + env_to_list(entry["env"]),
+ yield {"env": env_to_list(entry["env"]),
"compiler": entry["compiler"]}
for entry in itertools.product(conf["compiler"],
conf["env"]["matrix"]):
- yield {"env": global_env + env_to_list(entry[1]),
+ yield {"env": env_to_list(entry[1]),
"compiler": entry[0]}
def main():
@@ -35,6 +34,7 @@ def main():
sys.stderr.write("Usage: %s <travis-file>\n" % sys.argv[0])
return 1
conf = load_yaml(sys.argv[1])
+ print "\n".join((": ${%s}" % var for var in conf["env"]["global"]))
for config in conf_iter(conf):
print "("
print "\n".join(config["env"])
--
2.13.2
- [Qemu-devel] [PATCH v1 19/23] util/cacheinfo: add missing include (TEMP), (continued)
- [Qemu-devel] [PATCH v1 19/23] util/cacheinfo: add missing include (TEMP), Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 23/23] shippable: add powerpc target, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 16/23] shippable: add armel targets, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 21/23] docker: add qemu:debian-jessie based on outdated jessie release, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 17/23] shippable: add ppc64el targets, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 20/23] docker: add 'apt-fake' script which generate fake debian packages, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 22/23] docker: add debian/powerpc based on Jessie, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 15/23] docker: enable nettle to extend code coverage on arm64, Alex Bennée, 2017/07/17
- Re: [Qemu-devel] [PATCH v1 00/23] Current Travis Queue, Fam Zheng, 2017/07/17
- [Qemu-devel] [PATCH v2 00/31] Updated Travis Queue, Philippe Mathieu-Daudé, 2017/07/17
- [Qemu-devel] [PATCH v2 01/31] docker: allow customizing Travis global_env variables,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 02/31] travis: move make -j flag out of script, Philippe Mathieu-Daudé, 2017/07/17
- [Qemu-devel] [PATCH v2 03/31] docker: include python-yaml in travis.docker, Philippe Mathieu-Daudé, 2017/07/17
- [Qemu-devel] [PATCH v2 04/31] docker: add debug tools to travis.docker, Philippe Mathieu-Daudé, 2017/07/17
- [Qemu-devel] [PATCH v2 05/31] docker: rename debian stable -> 9 (Stretch), Philippe Mathieu-Daudé, 2017/07/17
- [Qemu-devel] [PATCH v2 06/31] docker: add common packages to debian base, Philippe Mathieu-Daudé, 2017/07/17
- [Qemu-devel] [PATCH v2 07/31] docker: debian/s390x no more in unstable, now available in Stretch, Philippe Mathieu-Daudé, 2017/07/17
- [Qemu-devel] [PATCH v2 08/31] docker: remove packages now dependent of qemu in Stretch, Philippe Mathieu-Daudé, 2017/07/17
- [Qemu-devel] [PATCH v2 09/31] docker: optimize debian9 base image, Philippe Mathieu-Daudé, 2017/07/17
- [Qemu-devel] [PATCH v2 10/31] docker: add debian/armel based on Stretch, Philippe Mathieu-Daudé, 2017/07/17
- [Qemu-devel] [PATCH v2 11/31] docker: add debian/ppc64el based on Stretch, Philippe Mathieu-Daudé, 2017/07/17