Skip to content

Commit 4afadcb

Browse files
committed
[4.20] Remove CNV-64560 bug marker
Bug CNV-59679 has been resolved, the windows vm deployment modified to install the virtio drivers. removing the fixture memory_metric_has_bug and what relate to it.
1 parent c0e35f7 commit 4afadcb

File tree

2 files changed

+0
-30
lines changed

2 files changed

+0
-30
lines changed

tests/observability/metrics/conftest.py

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@
4343
from utilities.constants import (
4444
DEFAULT_FEDORA_REGISTRY_URL,
4545
IPV4_STR,
46-
KUBEVIRT_VMI_MEMORY_PGMAJFAULT_TOTAL,
47-
KUBEVIRT_VMI_MEMORY_PGMINFAULT_TOTAL,
48-
KUBEVIRT_VMI_MEMORY_SWAP_IN_TRAFFIC_BYTES,
49-
KUBEVIRT_VMI_MEMORY_SWAP_OUT_TRAFFIC_BYTES,
50-
KUBEVIRT_VMI_MEMORY_UNUSED_BYTES,
51-
KUBEVIRT_VMI_MEMORY_USABLE_BYTES,
5246
MIGRATION_POLICY_VM_LABEL,
5347
ONE_CPU_CORE,
5448
ONE_CPU_THREAD,
@@ -74,7 +68,6 @@
7468
get_linux_guest_agent_version,
7569
get_node_selector_dict,
7670
get_pod_by_name_prefix,
77-
is_jira_open,
7871
unique_name,
7972
)
8073
from utilities.monitoring import get_metrics_value
@@ -97,14 +90,6 @@
9790
IP_RE_PATTERN_FROM_INTERFACE = r"eth0.*?inet (\d+\.\d+\.\d+\.\d+)/\d+"
9891
IP_ADDR_SHOW_COMMAND = shlex.split("ip addr show")
9992
LOGGER = logging.getLogger(__name__)
100-
METRICS_WITH_WINDOWS_VM_BUGS = [
101-
KUBEVIRT_VMI_MEMORY_UNUSED_BYTES,
102-
KUBEVIRT_VMI_MEMORY_SWAP_OUT_TRAFFIC_BYTES,
103-
KUBEVIRT_VMI_MEMORY_SWAP_IN_TRAFFIC_BYTES,
104-
KUBEVIRT_VMI_MEMORY_PGMAJFAULT_TOTAL,
105-
KUBEVIRT_VMI_MEMORY_USABLE_BYTES,
106-
KUBEVIRT_VMI_MEMORY_PGMINFAULT_TOTAL,
107-
]
10893
MINIMUM_QEMU_GUEST_AGENT_VERSION_FOR_GUEST_LOAD_METRICS = "9.6"
10994

11095

@@ -474,20 +459,6 @@ def windows_vm_for_test(namespace, unprivileged_client):
474459
yield vm
475460

476461

477-
@pytest.fixture(scope="session")
478-
def memory_metric_has_bug():
479-
return is_jira_open(jira_id="CNV-59679")
480-
481-
482-
@pytest.fixture()
483-
def xfail_if_memory_metric_has_bug(memory_metric_has_bug, cnv_vmi_monitoring_metrics_matrix__function__):
484-
if cnv_vmi_monitoring_metrics_matrix__function__ in METRICS_WITH_WINDOWS_VM_BUGS and memory_metric_has_bug:
485-
pytest.xfail(
486-
f"Bug (CNV-59679), Metric: {cnv_vmi_monitoring_metrics_matrix__function__} not showing "
487-
"any value for windows vm"
488-
)
489-
490-
491462
@pytest.fixture()
492463
def initial_migration_metrics_values(prometheus):
493464
yield {

tests/observability/metrics/test_metrics.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class TestMetricsWindows:
4040
def test_cnv_vmi_monitoring_metrics_windows_vm(
4141
self,
4242
prometheus,
43-
xfail_if_memory_metric_has_bug,
4443
windows_vm_for_test,
4544
cnv_vmi_monitoring_metrics_matrix__function__,
4645
):

0 commit comments

Comments
 (0)