From 3de8c2651638a9cad864688dd33b5970a7f5fb8f Mon Sep 17 00:00:00 2001
From: Loys Ollivier <lollivier@baylibre.com>
Date: Thu, 18 Jan 2018 14:35:09 +0100
Subject: job-prereq: Fix the tool after build changes
The job-prereq tool got broken by some latest changes on the build/url
scheme.
Make the url argument for agljobtemplate optionnal.
Pass build_type argument as build_type now that it is supported.
Fixes: 788b31a122c3 ("utils: change the url / build behavior scheme")
Change-Id: Ie9a0fc728a5e31cabd32e6463f2c6f913e1bd2cf
Signed-off-by: Loys Ollivier <lollivier@baylibre.com>
---
utils/agljobtemplate.py | 2 +-
utils/job-prereq.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py
index dec7fad..59abcb0 100644
--- a/utils/agljobtemplate.py
+++ b/utils/agljobtemplate.py
@@ -83,7 +83,7 @@ class Agljobtemplate(object):
def rfs_types(self):
return self.RFS_TYPE
- def render_job(self, url, machine, url_branch=None, url_version=None,
+ def render_job(self, machine, url=None, url_branch=None, url_version=None,
job_name="AGL-short-smoke", priority="medium", tests=[], rfs_type=None,
lava_callback=None, kci_callback=None,
rfs_image=None, kernel_image=None, dtb_image=None, modules_image=None,
diff --git a/utils/job-prereq.py b/utils/job-prereq.py
index cb690b1..2dadc61 100755
--- a/utils/job-prereq.py
+++ b/utils/job-prereq.py
@@ -46,7 +46,7 @@ def main():
ajt = agljobtemplate.Agljobtemplate(templates_dir)
args = parse_cmdline(ajt.machines)
- job = ajt.render_job(url=args.build_type[0],
+ job = ajt.render_job(build_type=args.build_type[0],
url_branch=args.build_type[1],
url_version=args.build_type[2],
machine=args.machine)
--
cgit