From ef0ac3d843bcbbc8425df2d3b19cb9d104b8fdb4 Mon Sep 17 00:00:00 2001 From: Mordan Vitalii Date: Tue, 24 Oct 2023 22:56:26 +0530 Subject: [PATCH] Allow to specify parent id in runner --- scripts/runner.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/runner.py b/scripts/runner.py index e2dd599..601d3b5 100755 --- a/scripts/runner.py +++ b/scripts/runner.py @@ -66,6 +66,7 @@ TAG_PROPERTIES = "requirement specifications" TAG_UPLOADER = "uploader" TAG_NAME = "name" +TAG_IDENTIFIER = "identifier" DEFAULT_CONFIG_COMMAND = "allmodconfig" DEFAULT_ARCH = "x86_64" @@ -91,7 +92,8 @@ class Runner(Component): 2. Launching klever; 3. Converting results to CVV. """ - def __init__(self, general_config: dict, kernel_dir_override: str, version_override: str, properties: list): + def __init__(self, general_config: dict, kernel_dir_override: str, version_override: str, properties: list, + parent_job_id: str): super().__init__(COMPONENT_RUNNER, general_config) bridge_config = self.config[TAG_BRIDGE] @@ -125,6 +127,7 @@ def __init__(self, general_config: dict, kernel_dir_override: str, version_overr self.job_config = self.__normalize_dir(klever_config.get(TAG_JOB_CONFIG), TAG_JOB_CONFIG) self.resource_config = self.__normalize_dir(klever_config.get(TAG_RESOURCE_CONFIG), TAG_RESOURCE_CONFIG) self.python_venv = self.__normalize_dir(klever_config.get(TAG_PYTHON_VENV, "")) + self.parent_job_id = parent_job_id # Klever Bridge config self.bridge_dir = self.__normalize_dir(bridge_config.get(TAG_HOME_DIR), TAG_HOME_DIR) @@ -181,6 +184,8 @@ def __update_job_config(self, build_base_dir: str): job_config[TAG_PROPERTIES] = self.properties uploaded_name = f"{'_'.join(self.properties)} - {self.version} - " bridge_config[TAG_UPLOADER][TAG_NAME] = uploaded_name + if self.parent_job_id: + bridge_config[TAG_UPLOADER][TAG_IDENTIFIER] = uploaded_name bridge_config[COMPONENT_BENCHMARK_LAUNCHER][TAG_OUTPUT_DIR] = \ os.path.join(self.klever_deploy_dir, KLEVER_TASKS_DIR) bridge_config[COMPONENT_BENCHMARK_LAUNCHER][TAG_TASKS_DIR] = \ @@ -266,6 +271,7 @@ def run(self): parser.add_argument("-d", "--kernel-dir", dest="kernel_dir", help="path to kernel directory") parser.add_argument("-v", "--version", dest="version", help="Linux kernel version") parser.add_argument("-p", "--properties", nargs='+', dest="properties", help="property to be checked") + parser.add_argument("-j", "--parent-job-id", dest="parent_job_id", help="parent job id") options = parser.parse_args() with open(options.config, errors='ignore', encoding='ascii') as data_file: @@ -274,5 +280,5 @@ def run(self): version = options.version props = options.properties - runner = Runner(config, kernel_dir, version, props) + runner = Runner(config, kernel_dir, version, props, options.parent_job_id) runner.run()