Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,12 @@ def cluster_sanity_scope_session(
dsc_resource: DataScienceCluster,
junitxml_plugin: Callable[[str, object], None],
) -> None:
# Skip cluster sanity check when running tests that have cluster_health or operator_health markers
selected_markers = {mark.name for item in request.session.items for mark in item.iter_markers()}
if {"cluster_health", "operator_health"} & selected_markers:
LOGGER.info("Skipping cluster sanity check because selected tests include cluster/operator health")
return

verify_cluster_sanity(
request=request,
nodes=nodes,
Expand Down