From e7832c5fd8c3c13a5b310519ba6d841da6e29d09 Mon Sep 17 00:00:00 2001 From: Shahzeb Siddiqui Date: Wed, 12 Jun 2024 16:30:00 -0400 Subject: [PATCH] add disable_check for pbs, lsf executors and add implementation logic for pbs, lsf, torque executors --- buildtest/config.py | 18 +++++++++++++++--- buildtest/schemas/settings.schema.json | 12 ++++++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/buildtest/config.py b/buildtest/config.py index 3136ba3cf..4d901d635 100644 --- a/buildtest/config.py +++ b/buildtest/config.py @@ -267,7 +267,11 @@ def _validate_lsf_executors(self): if self.is_executor_disabled(lsf_executors[executor]): self.disabled_executors.append(executor_name) continue - + if lsf_executors[executor].get("disable_check"): + self.valid_executors[executor_type][executor_name] = { + "setting": lsf_executors[executor] + } + continue if not lsf.validate_queue(executor=lsf_executors[executor]): self.invalid_executors.append(executor_name) continue @@ -388,7 +392,11 @@ def _validate_pbs_executors(self): if self.is_executor_disabled(pbs_executor[executor]): self.disabled_executors.append(executor_name) continue - + if pbs_executor[executor].get("disable_check"): + self.valid_executors[executor_type][executor_name] = { + "setting": pbs_executor[executor] + } + continue queue = pbs_executor[executor].get("queue") if not pbs.validate_queue(queue): self.invalid_executors.append(executor_name) @@ -423,7 +431,11 @@ def _validate_torque_executors(self): if self.is_executor_disabled(torque_executor[executor]): self.disabled_executors.append(executor_name) continue - + if torque_executor[executor].get("disable_check"): + self.valid_executors[executor_type][executor_name] = { + "setting": torque_executor[executor] + } + continue if not torque.validate_queue(torque_executor[executor]): self.invalid_executors.append(executor_name) continue diff --git a/buildtest/schemas/settings.schema.json b/buildtest/schemas/settings.schema.json index c2f9b1462..67abce896 100644 --- a/buildtest/schemas/settings.schema.json +++ b/buildtest/schemas/settings.schema.json @@ -581,7 +581,11 @@ "$ref": "#/definitions/account" }, "disable": {"$ref": "#/definitions/disable"}, - "module": { "$ref": "#/definitions/module" } + "module": { "$ref": "#/definitions/module" }, + "disable_check": { + "type": "boolean", + "description": "Disable check for partition or qos " + } } }, "pbs": { @@ -613,7 +617,11 @@ "$ref": "#/definitions/account" }, "disable": {"$ref": "#/definitions/disable"}, - "module": { "$ref": "#/definitions/module" } + "module": { "$ref": "#/definitions/module" }, + "disable_check": { + "type": "boolean", + "description": "Disable check for partition or qos " + } } }, "container": {