rfs-image: provide command line options to setup the image name

Provide 2 new command line options: --img-name and --img-ext
These two options require one another since the name image will be
composed from both of them in the following way:

rfs_image = img_name + "-" + yocto-machine + "." + img_ext

Change-Id: I2b6d174b4c141cea28ce63c3c7c7beae1a82ed4c
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>

2 files changed, 20 insertions, 3 deletions

diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py
index df3800d..0d34867 100644
--- a/utils/agljobtemplate.py
+++ b/utils/agljobtemplate.py
@@ -60,7 +60,7 @@ 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):
+                   kci_callback=None, rfs_image=None):
         test_templates = []
 
         if machine not in self.machines:
@@ -83,6 +83,9 @@ class Agljobtemplate(object):
         if rfs_type is not None:
             job['rootfs_type'] = rfs_type
 
+        if rfs_image is not None:
+            job['rfs_image'] = rfs_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 4a866d5..d3374ed 100755
--- a/utils/create-jobs.py
+++ b/utils/create-jobs.py
@@ -32,14 +32,27 @@ 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")
 
-    return parser.parse_args()
+    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
 
 
 def main():
+    img = None
     ajt = agljobtemplate.Agljobtemplate('templates')
     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
 
@@ -52,7 +65,8 @@ def main():
             args.job_name += ' - {}'.format(args.job_index)
 
     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_type=args.rfs_type, job_name=args.job_name, kci_callback=args.callback,
+                         rfs_image=img)
 
     if args.job_file is None:
         print job