[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 01/23] docker: allow customizing Travis global_en
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v1 01/23] docker: allow customizing Travis global_env variables |
Date: |
Mon, 17 Jul 2017 15:48:26 +0100 |
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>
Signed-off-by: Alex Bennée <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.0
- [Qemu-devel] [PATCH v1 00/23] Current Travis Queue, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 04/23] docker: add debug tools to travis.docker, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 02/23] travis: move make -j flag out of script, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 01/23] docker: allow customizing Travis global_env variables,
Alex Bennée <=
- [Qemu-devel] [PATCH v1 03/23] docker: include python-yaml in travis.docker, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 06/23] docker: add pkg-config and python-minimal packages to debian base, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 05/23] docker: rename debian stable -> 9 (Stretch), Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 08/23] docker: remove packages now dependent of qemu in Stretch, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 10/23] docker: add debian/ppc64el based on Stretch, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 09/23] docker: add debian/armel based on Stretch, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 07/23] docker: debian/s390x no more in unstable, now available in Stretch, Alex Bennée, 2017/07/17
- [Qemu-devel] [PATCH v1 12/23] docker: enable virgl to extend code coverage on amd64, Alex Bennée, 2017/07/17