From f85aaa11059b36972d5fd1c9cb838e65dca7a5b0 Mon Sep 17 00:00:00 2001 From: Khouloud Touil Date: Mon, 18 Feb 2019 15:16:30 +0100 Subject: Add new --build-id argument This patch adds a new build-id arguement that will fill the 'kernel_defconfig' in the metadata field with the build id extracted from the build-info file. Change-Id: I77bcc253a41d67d97afd7db32b8c8560d4309145 Signed-off-by: Khouloud Touil --- utils/agljobtemplate.py | 5 ++++- utils/create-jobs.py | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index e6876e7..1cda5ad 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -87,7 +87,7 @@ class Agljobtemplate(object): 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, + lava_callback=None, kci_callback=None, build_id=None, rfs_image=None, kernel_image=None, dtb_image=None, modules_image=None, build_type=None, vcs_commit=None, vcs_branch=None, build_version=None, device_tags=""): @@ -160,6 +160,9 @@ class Agljobtemplate(object): if build_version is not None: job['kernel_version'] = build_version + if build_id is not None: + job['kernel_defconfig'] = build_id + if rfs_type is not None: job['rootfs_type'] = rfs_type diff --git a/utils/create-jobs.py b/utils/create-jobs.py index 48df1bc..ed705cf 100755 --- a/utils/create-jobs.py +++ b/utils/create-jobs.py @@ -57,6 +57,8 @@ def parse_cmdline(machines, tests, rfs_types): help="The device tags to be used to create the job.", nargs='*', default="") parser.add_argument('--commit', dest='vcs_commit', action='store', help="The build hash.") + parser.add_argument('--build-id', dest='build_id', action='store', + help="The uniq build information, the build id.") args = parser.parse_args() @@ -86,7 +88,7 @@ def main(): lava_callback=args.callback_from, kci_callback=args.callback_to, rfs_image=args.rootfs_img, version=args.version, kernel_image=args.kernel_img, - dtb_image=args.dtb_img, + dtb_image=args.dtb_img, build_id=args.build_id, modules_image=args.modules_img, vcs_branch=args.vcs_branch, build_type=args.build_type, vcs_commit=args.vcs_commit, build_version=args.build_version, device_tags=args.device_tags) -- cgit 1.2.3-korg