summaryrefslogtreecommitdiffstats
path: root/utils/agljobtemplate.py
diff options
context:
space:
mode:
authorKhouloud Touil <ktouil@baylibre.com>2019-02-18 10:45:58 +0100
committerKhouloud Touil <ktouil@baylibre.com>2019-02-28 10:04:48 +0100
commit2a379506c2153e954cf8d80fa529d36bbcad813a (patch)
tree479d7ee3e21a13c30c4541e16abfe8a05b2c8fd8 /utils/agljobtemplate.py
parent5638ef6cb23bb34a122b46e750861fd3509b2682 (diff)
Separate --branch/--changeid --version/--patchset
This patch separates the --branch/--changeid and --version/--patchset arguments to use each one of them differently. As well it renames url_branch to changeid and url_version patchset. It modifies also the error check to follow the other changes and be sure that the needed arguments are well inserted. Change-Id: If64ae3620b1519fc391e79d954247938cffcb491 Signed-off-by: Khouloud Touil <ktouil@baylibre.com>
Diffstat (limited to 'utils/agljobtemplate.py')
-rw-r--r--utils/agljobtemplate.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py
index 09944ff..33aea31 100644
--- a/utils/agljobtemplate.py
+++ b/utils/agljobtemplate.py
@@ -85,7 +85,7 @@ class Agljobtemplate(object):
def rfs_types(self):
return self.RFS_TYPE
- def render_job(self, machine, url=None, url_branch=None, url_version=None,
+ def render_job(self, machine, url=None, changeid=None, patchset=None, 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,
@@ -119,7 +119,7 @@ class Agljobtemplate(object):
url_fragment = ''
if (build_type != 'default'):
- url_fragment += url_branch + '/' + url_version + '/'
+ url_fragment += changeid + '/' + patchset + '/'
if (machine == 'm3ulcb') or (machine == 'porter'):
url_fragment += machine + '-nogfx'