Update lava-ci scripts and templates to include branch support

49 files changed, 174 insertions, 69 deletions

diff --git a/lava-kernel-ci-job-creator.py b/lava-kernel-ci-job-creator.py
index 7676523..45236d9 100755
--- a/lava-kernel-ci-job-creator.py
+++ b/lava-kernel-ci-job-creator.py
@@ -32,8 +32,10 @@ def create_jobs(base_url, kernel, plans, platform_list, targets, priority):
     # TODO: define image_type dynamically
     image_type = 'kernel-ci'
     tree = build_info[1]
-    kernel_version = build_info[2]
-    defconfig = build_info[3]
+    branch = build_info[2]
+    kernel_version = build_info[3]
+    arch = build_info[4]
+    defconfig = build_info[5]
     has_modules = True
     checked_modules = False
 
@@ -121,7 +123,7 @@ def create_jobs(base_url, kernel, plans, platform_list, targets, priority):
                                         tmp = tmp.replace('{tree}', tree)
                                         if platform_name.endswith('.dtb'):
                                             tmp = tmp.replace('{device_tree}', platform_name)
-                                        tmp = tmp.replace('{kernel_version}', kernel_version)
+                                        tmp = tmp.replace('{kernel_describe}', kernel_version)
                                         if 'BIG_ENDIAN' in defconfig and plan == 'boot-be':
                                             tmp = tmp.replace('{endian}', 'big')
                                         else:
@@ -142,6 +144,9 @@ def create_jobs(base_url, kernel, plans, platform_list, targets, priority):
                                             tmp = tmp.replace('{priority}', priority.lower())
                                         else:
                                             tmp = tmp.replace('{priority}', 'high')
+                                        tmp = tmp.replace('{kernel_tree}', tree)
+                                        tmp = tmp.replace('{kernel_branch}', branch)
+                                        tmp = tmp.replace('{arch}', arch)
                                         fout.write(tmp)
                             print 'JSON Job created: jobs/%s' % job_name
 
@@ -152,13 +157,15 @@ def walk_url(url, plans=None, arch=None, targets=None, priority=None):
     global platform_list
     global legacy_platform_list
 
+    if not url.endswith('/'):
+        url += '/'
+
     try:
         html = urllib2.urlopen(url, timeout=30).read()
     except IOError, e:
         print 'error fetching %s: %s' % (url, e)
         exit(1)
-    if not url.endswith('/'):
-        url += '/'
+
     files = parse_re.findall(html)
     dirs = []
     for name in files:
@@ -178,7 +185,7 @@ def walk_url(url, plans=None, arch=None, targets=None, priority=None):
                 kernel = url + name
                 base_url = url
                 # qemu-aarch64,legacy
-                if 'arm64-defconfig' in url:
+                if 'arm64/defconfig' in url:
                     legacy_platform_list.append(url + 'qemu-aarch64-legacy')
             if name.endswith('.dtb') and name in device_map:
                 if base_url and base_url in url:
@@ -202,7 +209,7 @@ def walk_url(url, plans=None, arch=None, targets=None, priority=None):
                 kernel = url + name
                 base_url = url
                 # qemu-aarch64,legacy
-                if 'arm64-defconfig' in url:
+                if 'arm64/defconfig' in url:
                     legacy_platform_list.append(url + 'qemu-aarch64-legacy')
             if name.endswith('.dtb') and name in device_map:
                 if base_url and base_url in url:
@@ -234,8 +241,12 @@ def main(args):
         directory = setup_job_dir(config.get("jobs"))
     else:
         directory = setup_job_dir(os.getcwd() + '/jobs')
+    url = config.get('url')
+    arch = config.get('arch')
+    if arch:
+        url += arch + "/"
     print 'Scanning %s for kernel information...' % config.get("url")
-    walk_url(config.get("url"), config.get("plans"), config.get("arch"), config.get("targets"), config.get("priority"))
+    walk_url(url, config.get("plans"), arch, config.get("targets"), config.get("priority"))
     print 'Done scanning for kernel information'
     print 'Done creating JSON jobs'
     exit(0)
diff --git a/lava-report.py b/lava-report.py
index 7819294..7f93480 100755
--- a/lava-report.py
+++ b/lava-report.py
@@ -190,13 +190,13 @@ def boot_report(config):
         arch = None
         board_instance = None
         boot_retries = 0
-        kernel_defconfig_full = None
         kernel_defconfig = None
         kernel_defconfig_base = None
         kernel_version = None
         device_tree = None
         kernel_endian = None
         kernel_tree = None
+        git_branch = None
         kernel_addr = None
         initrd_addr = None
         dtb_addr = None
@@ -295,16 +295,11 @@ def boot_report(config):
                 board_instance = bundle_attributes['target']
             if utils.in_bundle_attributes(bundle_attributes, 'kernel.defconfig'):
                 kernel_defconfig = bundle_attributes['kernel.defconfig']
-                defconfig_list = kernel_defconfig.split('-')
-                arch = defconfig_list[0]
-                # Remove arch
-                defconfig_list.pop(0)
-                kernel_defconfig_full = '-'.join(defconfig_list)
-                kernel_defconfig_base = ''.join(kernel_defconfig_full.split('+')[:1])
-                if kernel_defconfig_full == kernel_defconfig_base:
-                    kernel_defconfig_full = None
-            if utils.in_bundle_attributes(bundle_attributes, 'kernel.version'):
-                kernel_version = bundle_attributes['kernel.version']
+                kernel_defconfig_base = ''.join(kernel_defconfig.split('+')[:1])
+            if utils.in_bundle_attributes(bundle_attributes, 'arch'):
+                arch = bundle_attributes['arch']
+            if utils.in_bundle_attributes(bundle_attributes, 'kernel.describe'):
+                kernel_version = bundle_attributes['kernel.describe']
             if utils.in_bundle_attributes(bundle_attributes, 'device.tree'):
                 device_tree = bundle_attributes['device.tree']
             if utils.in_bundle_attributes(bundle_attributes, 'kernel.endian'):
@@ -328,6 +323,8 @@ def boot_report(config):
                 boot_retries = int(bundle_attributes['boot_retries'])
             if utils.in_bundle_attributes(bundle_attributes, 'test.plan'):
                 test_plan = bundle_attributes['test.plan']
+            if utils.in_bundle_attributes(bundle_attributes, 'kernel.branch'):
+                git_branch = bundle_attributes['kernel.branch']
 
         # Check if we found efi-rtc
         if test_plan == 'boot-kvm-uefi' and not efi_rtc:
@@ -412,11 +409,11 @@ def boot_report(config):
             boot_meta['version'] = '1.0'
             boot_meta['arch'] = arch
             boot_meta['defconfig'] = kernel_defconfig_base
-            if kernel_defconfig_full is not None:
-                boot_meta['defconfig_full'] = kernel_defconfig_full
+            boot_meta['defconfig_full'] = kernel_defconfig
             if device_map[device_type][1]:
                 boot_meta['mach'] = device_map[device_type][1]
             boot_meta['kernel'] = kernel_version
+            boot_meta['git_branch'] = git_branch
             boot_meta['job'] = kernel_tree
             boot_meta['board'] = platform_name
             if board_offline and result == 'FAIL':
diff --git a/lava-v2-jobs-from-api.py b/lava-v2-jobs-from-api.py
index fd92b5c..2198efc 100755
--- a/lava-v2-jobs-from-api.py
+++ b/lava-v2-jobs-from-api.py
@@ -39,20 +39,23 @@ def main(args):
     arch = args.get('arch')
     plans = args.get('plans')
     branch = args.get('branch')
+    git_describe = args.get('describe')
     tree = args.get('tree')
     kernel = tree
+    storage = args.get('storage')
     api = args.get('api')
     headers = {
         "Authorization": config.get('token')
     }
 
     print "Working on kernel %s/%s" % (tree, branch)
-    url = urlparse.urljoin(api, ("/build?job=%s&kernel=%s&status=PASS&arch=%s" % (tree, branch, arch)))
+    url = urlparse.urljoin(api, ("/build?job=%s&kernel=%s&git_branch=%s&status=PASS&arch=%s" % (tree, git_describe, branch, arch)))
     print "Calling KernelCI API: %s" % url
     response = requests.get(url, headers=headers)
     if response.status_code != 200:
         print "Error calling KernelCI API"
         print response
+        print response.content
         sys.exit(1)
     data = json.loads(response.content)
     builds = data['result']
@@ -134,7 +137,7 @@ def main(args):
                                     template_file = cwd + '/templates/' + short_template_file
                                     if os.path.exists(template_file) and template_file.endswith('.jinja2'):
                                         job_name = tree + '-' + branch + '-' + arch + "-" + defconfig[:100] + '-' + dtb + '-' + device_type + '-' + plan
-                                        base_url = "https://storage.kernelci.org/%s/%s/%s/" % (build['job'], build['kernel'], arch_defconfig)
+                                        base_url = "%s/%s/%s/%s/%s/%s/" % (storage, build['job'], build['git_branch'], build['kernel'], arch_defconfig)
                                         dtb_url = base_url + "dtbs/" + dtb_full
                                         kernel_url = urlparse.urljoin(base_url, build['kernel_image'])
                                         defconfig_base = ''.join(defconfig.split('+')[:1])
@@ -184,9 +187,11 @@ if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument("--token", help="KernelCI API Token")
     parser.add_argument("--api", help="KernelCI API URL", default="https://api.kernelci.org")
+    parser.add_argument("--storage", help="KernelCI storage URL", default="https://storage.kernelci.org")
     parser.add_argument("--jobs", help="absolute path to top jobs folder")
     parser.add_argument("--tree", help="KernelCI build kernel tree")
     parser.add_argument("--branch", help="KernelCI build kernel branch")
+    parser.add_argument("--describe", help="KernelCI build kernel git describe")
     parser.add_argument("--config", help="configuration for the LAVA server")
     parser.add_argument("--section", default="default", help="section in the LAVA config file")
     parser.add_argument("--plans", nargs='+', required=True, help="test plan to create jobs for")
diff --git a/templates/boot-be/generic-arm-dtb-kernel-ci-boot-be-template.json b/templates/boot-be/generic-arm-dtb-kernel-ci-boot-be-template.json
index 707dfa8..7481d53 100644
--- a/templates/boot-be/generic-arm-dtb-kernel-ci-boot-be-template.json
+++ b/templates/boot-be/generic-arm-dtb-kernel-ci-boot-be-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/boot-be/generic-arm64-dtb-kernel-ci-boot-be-template.json b/templates/boot-be/generic-arm64-dtb-kernel-ci-boot-be-template.json
index eb356d9..7a46e25 100644
--- a/templates/boot-be/generic-arm64-dtb-kernel-ci-boot-be-template.json
+++ b/templates/boot-be/generic-arm64-dtb-kernel-ci-boot-be-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/boot-kvm-uefi/generic-arm64-boot-kvm-uefi-template.json b/templates/boot-kvm-uefi/generic-arm64-boot-kvm-uefi-template.json
index 338f048..e462ba1 100644
--- a/templates/boot-kvm-uefi/generic-arm64-boot-kvm-uefi-template.json
+++ b/templates/boot-kvm-uefi/generic-arm64-boot-kvm-uefi-template.json
@@ -23,7 +23,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/boot-kvm/generic-arm-boot-kvm-template.json b/templates/boot-kvm/generic-arm-boot-kvm-template.json
index 4ba5ed4..2c8f8b9 100644
--- a/templates/boot-kvm/generic-arm-boot-kvm-template.json
+++ b/templates/boot-kvm/generic-arm-boot-kvm-template.json
@@ -23,7 +23,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/boot-kvm/generic-arm64-boot-kvm-template.json b/templates/boot-kvm/generic-arm64-boot-kvm-template.json
index 5b2e676..b0e0114 100644
--- a/templates/boot-kvm/generic-arm64-boot-kvm-template.json
+++ b/templates/boot-kvm/generic-arm64-boot-kvm-template.json
@@ -23,7 +23,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/boot-nfs-mp/generic-arm-dtb-kernel-ci-boot-nfs-mp-template.json b/templates/boot-nfs-mp/generic-arm-dtb-kernel-ci-boot-nfs-mp-template.json
index 9c91769..48bfe97 100644
--- a/templates/boot-nfs-mp/generic-arm-dtb-kernel-ci-boot-nfs-mp-template.json
+++ b/templates/boot-nfs-mp/generic-arm-dtb-kernel-ci-boot-nfs-mp-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/boot-nfs/generic-arm-dtb-kernel-ci-boot-nfs-template.json b/templates/boot-nfs/generic-arm-dtb-kernel-ci-boot-nfs-template.json
index 9c91769..48bfe97 100644
--- a/templates/boot-nfs/generic-arm-dtb-kernel-ci-boot-nfs-template.json
+++ b/templates/boot-nfs/generic-arm-dtb-kernel-ci-boot-nfs-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/boot-nfs/generic-arm64-dtb-kernel-ci-boot-nfs-template.json b/templates/boot-nfs/generic-arm64-dtb-kernel-ci-boot-nfs-template.json
index 00c6029..764f17f 100644
--- a/templates/boot-nfs/generic-arm64-dtb-kernel-ci-boot-nfs-template.json
+++ b/templates/boot-nfs/generic-arm64-dtb-kernel-ci-boot-nfs-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/boot/cfe-arm-dtb-kernel-ci-boot-template.json b/templates/boot/cfe-arm-dtb-kernel-ci-boot-template.json
index 362e0bb..4824774 100644
--- a/templates/boot/cfe-arm-dtb-kernel-ci-boot-template.json
+++ b/templates/boot/cfe-arm-dtb-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json b/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json
index bfc6b64..a781c1e 100644
--- a/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm-dtb-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/boot/generic-arm-kernel-ci-boot-template.json b/templates/boot/generic-arm-kernel-ci-boot-template.json
index 1940722..57fafa5 100644
--- a/templates/boot/generic-arm-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
                 "platform.fastboot": "{fastboot}",
diff --git a/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json b/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json
index d761903..23d2c5c 100644
--- a/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm64-dtb-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/boot/generic-arm64-dtb-uefi-kernel-ci-boot-template.json b/templates/boot/generic-arm64-dtb-uefi-kernel-ci-boot-template.json
index 252d298..c37ca63 100644
--- a/templates/boot/generic-arm64-dtb-uefi-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm64-dtb-uefi-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/boot/generic-arm64-kernel-ci-boot-template.json b/templates/boot/generic-arm64-kernel-ci-boot-template.json
index b12409b..f0a13f2 100644
--- a/templates/boot/generic-arm64-kernel-ci-boot-template.json
+++ b/templates/boot/generic-arm64-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
                 "platform.fastboot": "{fastboot}",
diff --git a/templates/boot/generic-x86-kernel-ci-boot-template.json b/templates/boot/generic-x86-kernel-ci-boot-template.json
index 4822c1f..8fd3be6 100644
--- a/templates/boot/generic-x86-kernel-ci-boot-template.json
+++ b/templates/boot/generic-x86-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
                 "platform.fastboot": "{fastboot}",
diff --git a/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json b/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json
index 675cefd..2a3f4fb 100644
--- a/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json
+++ b/templates/boot/juno-arm64-dtb-kernel-ci-boot-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/cpufreq-ljt-stress-test/generic-arm-dtb-kernel-ci-cpufreq-ljt-stress-test-template.json b/templates/cpufreq-ljt-stress-test/generic-arm-dtb-kernel-ci-cpufreq-ljt-stress-test-template.json
index 6481e7f..b9349a3 100644
--- a/templates/cpufreq-ljt-stress-test/generic-arm-dtb-kernel-ci-cpufreq-ljt-stress-test-template.json
+++ b/templates/cpufreq-ljt-stress-test/generic-arm-dtb-kernel-ci-cpufreq-ljt-stress-test-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/cyclictest-basic/generic-arm-dtb-kernel-ci-cyclictest-basic-template.json b/templates/cyclictest-basic/generic-arm-dtb-kernel-ci-cyclictest-basic-template.json
index 3926ee3..3c6f4ba 100644
--- a/templates/cyclictest-basic/generic-arm-dtb-kernel-ci-cyclictest-basic-template.json
+++ b/templates/cyclictest-basic/generic-arm-dtb-kernel-ci-cyclictest-basic-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/cyclictest-basic/generic-arm64-uboot-dtb-kernel-ci-cyclictest-basic-template.json b/templates/cyclictest-basic/generic-arm64-uboot-dtb-kernel-ci-cyclictest-basic-template.json
index dcc0f77..8503ced 100644
--- a/templates/cyclictest-basic/generic-arm64-uboot-dtb-kernel-ci-cyclictest-basic-template.json
+++ b/templates/cyclictest-basic/generic-arm64-uboot-dtb-kernel-ci-cyclictest-basic-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/cyclictest-basic/juno-arm64-dtb-kernel-ci-cyclictest-basic-template.json b/templates/cyclictest-basic/juno-arm64-dtb-kernel-ci-cyclictest-basic-template.json
index 23931c7..5bf8c63 100644
--- a/templates/cyclictest-basic/juno-arm64-dtb-kernel-ci-cyclictest-basic-template.json
+++ b/templates/cyclictest-basic/juno-arm64-dtb-kernel-ci-cyclictest-basic-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/cyclictest/generic-arm-dtb-kernel-ci-cyclictest-template.json b/templates/cyclictest/generic-arm-dtb-kernel-ci-cyclictest-template.json
index 568112b..45f0309 100644
--- a/templates/cyclictest/generic-arm-dtb-kernel-ci-cyclictest-template.json
+++ b/templates/cyclictest/generic-arm-dtb-kernel-ci-cyclictest-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/cyclictest/generic-arm64-uboot-dtb-kernel-ci-cyclictest-template.json b/templates/cyclictest/generic-arm64-uboot-dtb-kernel-ci-cyclictest-template.json
index 6b5922f..34edafb 100644
--- a/templates/cyclictest/generic-arm64-uboot-dtb-kernel-ci-cyclictest-template.json
+++ b/templates/cyclictest/generic-arm64-uboot-dtb-kernel-ci-cyclictest-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/cyclictest/generic-x86-kernel-ci-cyclictest-template.json b/templates/cyclictest/generic-x86-kernel-ci-cyclictest-template.json
index 519559c..327bad3 100644
--- a/templates/cyclictest/generic-x86-kernel-ci-cyclictest-template.json
+++ b/templates/cyclictest/generic-x86-kernel-ci-cyclictest-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/cyclictest/juno-arm64-dtb-kernel-ci-cyclictest-template.json b/templates/cyclictest/juno-arm64-dtb-kernel-ci-cyclictest-template.json
index d01d0e1..e88adae 100644
--- a/templates/cyclictest/juno-arm64-dtb-kernel-ci-cyclictest-template.json
+++ b/templates/cyclictest/juno-arm64-dtb-kernel-ci-cyclictest-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/hackbench/generic-arm64-uboot-dtb-kernel-ci-hackbench-template.json b/templates/hackbench/generic-arm64-uboot-dtb-kernel-ci-hackbench-template.json
index e197936..a325abe 100644
--- a/templates/hackbench/generic-arm64-uboot-dtb-kernel-ci-hackbench-template.json
+++ b/templates/hackbench/generic-arm64-uboot-dtb-kernel-ci-hackbench-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/hackbench/generic-x86-kernel-ci-hackbench-template.json b/templates/hackbench/generic-x86-kernel-ci-hackbench-template.json
index 2dc7398..42ae316 100644
--- a/templates/hackbench/generic-x86-kernel-ci-hackbench-template.json
+++ b/templates/hackbench/generic-x86-kernel-ci-hackbench-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/hackbench/juno-arm64-dtb-kernel-ci-hackbench-template.json b/templates/hackbench/juno-arm64-dtb-kernel-ci-hackbench-template.json
index d70cfc7..4f0c40a 100644
--- a/templates/hackbench/juno-arm64-dtb-kernel-ci-hackbench-template.json
+++ b/templates/hackbench/juno-arm64-dtb-kernel-ci-hackbench-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/kselftest/generic-arm-dtb-kernel-ci-kselftest-template.json b/templates/kselftest/generic-arm-dtb-kernel-ci-kselftest-template.json
index 479d783..9eec497 100644
--- a/templates/kselftest/generic-arm-dtb-kernel-ci-kselftest-template.json
+++ b/templates/kselftest/generic-arm-dtb-kernel-ci-kselftest-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/kselftest/generic-arm64-dtb-kernel-ci-kselftest-template.json b/templates/kselftest/generic-arm64-dtb-kernel-ci-kselftest-template.json
index 550034b..1f3dca6 100644
--- a/templates/kselftest/generic-arm64-dtb-kernel-ci-kselftest-template.json
+++ b/templates/kselftest/generic-arm64-dtb-kernel-ci-kselftest-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/kselftest/generic-arm64-kernel-ci-kselftest-template.json b/templates/kselftest/generic-arm64-kernel-ci-kselftest-template.json
index f4f1340..46eb579 100644
--- a/templates/kselftest/generic-arm64-kernel-ci-kselftest-template.json
+++ b/templates/kselftest/generic-arm64-kernel-ci-kselftest-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/kselftest/generic-x86-kernel-ci-kselftest-template.json b/templates/kselftest/generic-x86-kernel-ci-kselftest-template.json
index 699c623..06fc7c6 100644
--- a/templates/kselftest/generic-x86-kernel-ci-kselftest-template.json
+++ b/templates/kselftest/generic-x86-kernel-ci-kselftest-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/kselftest/juno-arm64-dtb-kernel-ci-kselftest-template.json b/templates/kselftest/juno-arm64-dtb-kernel-ci-kselftest-template.json
index aec273b..3394637 100644
--- a/templates/kselftest/juno-arm64-dtb-kernel-ci-kselftest-template.json
+++ b/templates/kselftest/juno-arm64-dtb-kernel-ci-kselftest-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/lmbench/generic-arm-dtb-kernel-ci-lmbench-template.json b/templates/lmbench/generic-arm-dtb-kernel-ci-lmbench-template.json
index 7fc46d0..c38521e 100644
--- a/templates/lmbench/generic-arm-dtb-kernel-ci-lmbench-template.json
+++ b/templates/lmbench/generic-arm-dtb-kernel-ci-lmbench-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/lmbench/generic-arm64-uboot-dtb-kernel-ci-lmbench-template.json b/templates/lmbench/generic-arm64-uboot-dtb-kernel-ci-lmbench-template.json
index 57a04b5..69052a2 100644
--- a/templates/lmbench/generic-arm64-uboot-dtb-kernel-ci-lmbench-template.json
+++ b/templates/lmbench/generic-arm64-uboot-dtb-kernel-ci-lmbench-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/lmbench/generic-x86-kernel-ci-lmbench-template.json b/templates/lmbench/generic-x86-kernel-ci-lmbench-template.json
index 2728447..8a57c7f 100644
--- a/templates/lmbench/generic-x86-kernel-ci-lmbench-template.json
+++ b/templates/lmbench/generic-x86-kernel-ci-lmbench-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/lmbench/juno-arm64-dtb-kernel-ci-lmbench-template.json b/templates/lmbench/juno-arm64-dtb-kernel-ci-lmbench-template.json
index f9390a4..4440a21 100644
--- a/templates/lmbench/juno-arm64-dtb-kernel-ci-lmbench-template.json
+++ b/templates/lmbench/juno-arm64-dtb-kernel-ci-lmbench-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/ltp-mm/generic-arm-dtb-kernel-ci-ltp-mm-template.json b/templates/ltp-mm/generic-arm-dtb-kernel-ci-ltp-mm-template.json
index 3104fa8..e4b3c37 100644
--- a/templates/ltp-mm/generic-arm-dtb-kernel-ci-ltp-mm-template.json
+++ b/templates/ltp-mm/generic-arm-dtb-kernel-ci-ltp-mm-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/ltp-mm/generic-arm64-uboot-dtb-kernel-ci-ltp-mm-template.json b/templates/ltp-mm/generic-arm64-uboot-dtb-kernel-ci-ltp-mm-template.json
index 93e6032..aa70092 100644
--- a/templates/ltp-mm/generic-arm64-uboot-dtb-kernel-ci-ltp-mm-template.json
+++ b/templates/ltp-mm/generic-arm64-uboot-dtb-kernel-ci-ltp-mm-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/ltp-mm/juno-arm64-dtb-kernel-ci-ltp-mm-template.json b/templates/ltp-mm/juno-arm64-dtb-kernel-ci-ltp-mm-template.json
index 93e6032..aa70092 100644
--- a/templates/ltp-mm/juno-arm64-dtb-kernel-ci-ltp-mm-template.json
+++ b/templates/ltp-mm/juno-arm64-dtb-kernel-ci-ltp-mm-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/ltp-realtime/generic-arm-dtb-kernel-ci-ltp-realtime-template.json b/templates/ltp-realtime/generic-arm-dtb-kernel-ci-ltp-realtime-template.json
index 2fa0641..8898406 100644
--- a/templates/ltp-realtime/generic-arm-dtb-kernel-ci-ltp-realtime-template.json
+++ b/templates/ltp-realtime/generic-arm-dtb-kernel-ci-ltp-realtime-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/ltp-realtime/generic-arm64-uboot-dtb-kernel-ci-ltp-realtime-template.json b/templates/ltp-realtime/generic-arm64-uboot-dtb-kernel-ci-ltp-realtime-template.json
index 7b84cba..f97245a 100644
--- a/templates/ltp-realtime/generic-arm64-uboot-dtb-kernel-ci-ltp-realtime-template.json
+++ b/templates/ltp-realtime/generic-arm64-uboot-dtb-kernel-ci-ltp-realtime-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/ltp-realtime/generic-x86-kernel-ci-ltp-realtime-template.json b/templates/ltp-realtime/generic-x86-kernel-ci-ltp-realtime-template.json
index dac5d1d..256e336 100644
--- a/templates/ltp-realtime/generic-x86-kernel-ci-ltp-realtime-template.json
+++ b/templates/ltp-realtime/generic-x86-kernel-ci-ltp-realtime-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/ltp-realtime/juno-arm64-dtb-kernel-ci-ltp-realtime-template.json b/templates/ltp-realtime/juno-arm64-dtb-kernel-ci-ltp-realtime-template.json
index fc2a0cb..3943534 100644
--- a/templates/ltp-realtime/juno-arm64-dtb-kernel-ci-ltp-realtime-template.json
+++ b/templates/ltp-realtime/juno-arm64-dtb-kernel-ci-ltp-realtime-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/ltp-syscalls/generic-arm-dtb-kernel-ci-ltp-syscalls-template.json b/templates/ltp-syscalls/generic-arm-dtb-kernel-ci-ltp-syscalls-template.json
index 23a533f..181d252 100644
--- a/templates/ltp-syscalls/generic-arm-dtb-kernel-ci-ltp-syscalls-template.json
+++ b/templates/ltp-syscalls/generic-arm-dtb-kernel-ci-ltp-syscalls-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/ltp-syscalls/generic-arm64-uboot-dtb-kernel-ci-ltp-syscalls-template.json b/templates/ltp-syscalls/generic-arm64-uboot-dtb-kernel-ci-ltp-syscalls-template.json
index a93f166..7ee1b8b 100644
--- a/templates/ltp-syscalls/generic-arm64-uboot-dtb-kernel-ci-ltp-syscalls-template.json
+++ b/templates/ltp-syscalls/generic-arm64-uboot-dtb-kernel-ci-ltp-syscalls-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",
diff --git a/templates/ltp-syscalls/juno-arm64-dtb-kernel-ci-ltp-syscalls-template.json b/templates/ltp-syscalls/juno-arm64-dtb-kernel-ci-ltp-syscalls-template.json
index a93f166..7ee1b8b 100644
--- a/templates/ltp-syscalls/juno-arm64-dtb-kernel-ci-ltp-syscalls-template.json
+++ b/templates/ltp-syscalls/juno-arm64-dtb-kernel-ci-ltp-syscalls-template.json
@@ -6,7 +6,9 @@
                 "image.type": "{image_type}",
                 "image.url": "{image_url}",
                 "kernel.tree": "{tree}",
-                "kernel.version": "{kernel_version}",
+                "kernel.describe": "{kernel_describe}",
+                "kernel.branch": "{kernel_branch}",
+                "arch": "{arch}",
                 "device.tree": "{device_tree}",
                 "kernel.endian": "{endian}",
                 "kernel.defconfig": "{defconfig}",