| Message ID | 20190320221207.11366-2-wainersm@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | make docker-travis work again | expand |
Wainer dos Santos Moschetta <wainersm@redhat.com> writes: > Fixed the travis.py script that has failed to parse the current > QEMU_SRC/.travis.yml file. It no longer makes combinations from > env/matrix, instead it uses explicit includes. Also the compiler > can be omitted from matrix/include, so that Travis chooses the > first entry of the global compiler list. > > Replaced yaml.load() with yaml.safe_load() so that quieting the > following deprecation warning: > https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation > > Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/docker/travis.py | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/tests/docker/travis.py b/tests/docker/travis.py > index ea1ef169e6..e1433012bd 100755 > --- a/tests/docker/travis.py > +++ b/tests/docker/travis.py > @@ -17,18 +17,17 @@ import yaml > import itertools > > def load_yaml(fname): > - return yaml.load(open(fname, "r").read()) > + return yaml.safe_load(open(fname, "r").read()) > > def conf_iter(conf): > + # If "compiler" is omitted from the included env then Travis picks the > + # first entry of the global compiler list. > + default_compiler = conf["compiler"][0] > def env_to_list(env): > return env if isinstance(env, list) else [env] > for entry in conf["matrix"]["include"]: > yield {"env": env_to_list(entry["env"]), > - "compiler": entry["compiler"]} > - for entry in itertools.product(conf["compiler"], > - conf["env"]["matrix"]): > - yield {"env": env_to_list(entry[1]), > - "compiler": entry[0]} > + "compiler": entry.get("compiler", default_compiler)} > > def main(): > if len(sys.argv) < 2: -- Alex Bennée
diff --git a/tests/docker/travis.py b/tests/docker/travis.py index ea1ef169e6..e1433012bd 100755 --- a/tests/docker/travis.py +++ b/tests/docker/travis.py @@ -17,18 +17,17 @@ import yaml import itertools def load_yaml(fname): - return yaml.load(open(fname, "r").read()) + return yaml.safe_load(open(fname, "r").read()) def conf_iter(conf): + # If "compiler" is omitted from the included env then Travis picks the + # first entry of the global compiler list. + default_compiler = conf["compiler"][0] def env_to_list(env): return env if isinstance(env, list) else [env] for entry in conf["matrix"]["include"]: yield {"env": env_to_list(entry["env"]), - "compiler": entry["compiler"]} - for entry in itertools.product(conf["compiler"], - conf["env"]["matrix"]): - yield {"env": env_to_list(entry[1]), - "compiler": entry[0]} + "compiler": entry.get("compiler", default_compiler)} def main(): if len(sys.argv) < 2:
Fixed the travis.py script that has failed to parse the current QEMU_SRC/.travis.yml file. It no longer makes combinations from env/matrix, instead it uses explicit includes. Also the compiler can be omitted from matrix/include, so that Travis chooses the first entry of the global compiler list. Replaced yaml.load() with yaml.safe_load() so that quieting the following deprecation warning: https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com> --- tests/docker/travis.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)