Skip to content

Commit

Permalink
Merge pull request #1786 from buildtesters/disable_executor_check
Browse files Browse the repository at this point in the history
Disable executor check in executor configuration
  • Loading branch information
shahzebsiddiqui authored Jun 12, 2024
2 parents 679f5af + e7832c5 commit a868fb1
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 6 deletions.
23 changes: 20 additions & 3 deletions buildtest/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -311,6 +315,11 @@ def _validate_slurm_executors(self):
if self.is_executor_disabled(slurm_executor[executor]):
self.disabled_executors.append(executor_name)
continue
if slurm_executor[executor].get("disable_check"):
self.valid_executors[executor_type][executor_name] = {
"setting": slurm_executor[executor]
}
continue
if slurm_executor[executor].get("partition"):
if not slurm.validate_partition(slurm_executor[executor]):
self.invalid_executors.append(executor_name)
Expand Down Expand Up @@ -383,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)
Expand Down Expand Up @@ -418,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
Expand Down
18 changes: 15 additions & 3 deletions buildtest/schemas/settings.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,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 "
}
}
},
"lsf": {
Expand Down Expand Up @@ -577,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": {
Expand Down Expand Up @@ -609,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": {
Expand Down

0 comments on commit a868fb1

Please sign in to comment.