aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorLoys Ollivier <lollivier@baylibre.com>2017-10-05 18:41:07 +0200
committerLoys Ollivier <lollivier@baylibre.com>2017-10-06 11:56:09 +0200
commit0b427702e5f32f8573620a6770cb234bc31e2415 (patch)
tree3e485affca826d1449be4bfaa7d1a9a148c6e444 /utils
parentd32e1ebcafc22434624ec6ae68bd404bb088a513 (diff)
New arguments to specify build artifacts names
Added new command line arguments to specifiy build artifacts names: - "--rootfs-img": for the rootfs file name - "--kernel-img": for the kernel name - "--dtb-img": for the dtb file name - "--modules-img": for the modules file name Change-Id: I665dee2b326aeaaf35148345f0501e49950ba9aa Signed-off-by: Loys Ollivier <lollivier@baylibre.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/agljobtemplate.py12
-rwxr-xr-xutils/create-jobs.py24
2 files changed, 24 insertions, 12 deletions
diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py
index c8edc8e..528a3b9 100644
--- a/utils/agljobtemplate.py
+++ b/utils/agljobtemplate.py
@@ -60,7 +60,8 @@ class Agljobtemplate(object):
return self.RFS_TYPE
def render_job(self, url, machine, job_name="AGL-short-smoke", priority="medium", tests=[], rfs_type=None,
- kci_callback=None, rfs_image=None, build_version=None):
+ kci_callback=None, rfs_image=None, kernel_image=None, dtb_image=None, modules_image=None,
+ build_version=None):
test_templates = []
if machine not in self.machines:
@@ -89,6 +90,15 @@ class Agljobtemplate(object):
if rfs_image is not None:
job['rfs_image'] = rfs_image
+ if kernel_image is not None:
+ job['kernel_image'] = kernel_image
+
+ if dtb_image is not None:
+ job['dtb'] = dtb_image
+
+ if modules_image is not None:
+ job['modules'] = modules_image
+
if kci_callback:
if test_templates:
job['callback_name'] = 'lava/test'
diff --git a/utils/create-jobs.py b/utils/create-jobs.py
index 66e3b00..347c62b 100755
--- a/utils/create-jobs.py
+++ b/utils/create-jobs.py
@@ -32,18 +32,19 @@ def parse_cmdline(machines, tests, rfs_types):
help='job id for link creation: URLBASE/JOB_ID')
parser.add_argument('-i', '--jobidx', dest='job_index', action='store',
help='job index for link creation: URLBASE/JOB_ID/JOB_INDEX', default='1')
- parser.add_argument('--img-name', dest='img_name', action='store',
- help="img base name (such as agl-demo-platform) - require img_ext")
- parser.add_argument('--img-ext', dest='img_ext', action='store',
- help="img extension (such as ext4.xz) - require img_name")
+ parser.add_argument('--rootfs-img', dest='rootfs_img', action='store',
+ help="The name of the root file system image (such as agl-demo-platform-raspberrypi3.ext4.xz)")
+ parser.add_argument('--kernel-img', dest='kernel_img', action='store',
+ help="The name of the kernel to boot (such as uImage)")
+ parser.add_argument('--dtb-img', dest='dtb_img', action='store',
+ help="The name of the dtb to use (such as uImage-bcm2710-rpi-3-b.dtb)")
+ parser.add_argument('--modules-img', dest='modules_img', action='store',
+ help="The name of the modules to use (such as modules.tar.xz)")
parser.add_argument('--build-version', dest='build_version', action='store',
help="the version number of the AGL build.")
args = parser.parse_args()
- if (not args.img_name) != (not args.img_ext):
- parser.error("--img-name and --img-ext require one another")
-
return args
@@ -53,9 +54,6 @@ def main():
ajt = agljobtemplate.Agljobtemplate(templates_dir)
args = parse_cmdline(ajt.machines, ajt.tests, ajt.rfs_types)
- if args.img_name:
- img = args.img_name + "-" + args.machine + "." + args.img_ext
-
if args.tests is not None and 'all' in args.tests:
args.tests = ajt.tests
@@ -69,7 +67,11 @@ def main():
job = ajt.render_job(args.urlbase, args.machine, tests=args.tests, priority=args.priority,
rfs_type=args.rfs_type, job_name=args.job_name, kci_callback=args.callback,
- rfs_image=img, build_version=args.build_version)
+ rfs_image=args.rootfs_img,
+ kernel_image=args.kernel_img,
+ dtb_image=args.dtb_img,
+ modules_image=args.modules_img,
+ build_version=args.build_version)
if args.job_file is None:
print job