Skip to content

Remove CNV-76682 and last_over_time query #4481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rnetser merged 1 commit into from
Apr 27, 2026
+18 −14
Merged

Remove CNV-76682 and last_over_time query #4481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions tests/observability/metrics/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,18 @@ def vm_migration_metrics_vmim_scope_class(admin_client, vm_for_migration_metrics
yield vmim


@pytest.fixture()
def vm_migration_metrics_vmim_scope_function(admin_client, vm_for_migration_metrics_test):
with VirtualMachineInstanceMigration(
name="vm-migration-metrics-vmim",
namespace=vm_for_migration_metrics_test.namespace,
vmi_name=vm_for_migration_metrics_test.vmi.name,
client=admin_client,
) as vmim:
vmim.wait_for_status(status=vmim.Status.RUNNING, timeout=TIMEOUT_3MIN)
yield vmim
Comment thread
OhadRevah marked this conversation as resolved.


@pytest.fixture(scope="class")
def migration_succeeded_scope_class(vm_migration_metrics_vmim_scope_class):
vm_migration_metrics_vmim_scope_class.wait_for_status(
Expand Down
14 changes: 2 additions & 12 deletions tests/observability/metrics/test_migration_metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import logging
from datetime import datetime, timezone
Comment thread
OhadRevah marked this conversation as resolved.

import pytest

Expand Down Expand Up @@ -42,7 +41,6 @@ class TestKubevirtVmiMigrationMetrics:
),
],
)
@pytest.mark.jira("CNV-76682", run=False)
@pytest.mark.s390x
def test_kubevirt_vmi_migration_metrics(
self,
Expand All @@ -51,19 +49,11 @@ def test_kubevirt_vmi_migration_metrics(
admin_client,
migration_policy_with_bandwidth_scope_class,
vm_for_migration_metrics_test,
vm_migration_metrics_vmim_scope_class,
vm_migration_metrics_vmim_scope_function,
query,
):
minutes_passed_since_migration_start = (
int(datetime.now(timezone.utc).timestamp())
- timestamp_to_seconds(
timestamp=vm_for_migration_metrics_test.vmi.instance.status.migrationState.startTimestamp
)
) // 60
wait_for_non_empty_metrics_value(
prometheus=prometheus,
metric_name=f"last_over_time({query.format(vm_name=vm_for_migration_metrics_test.name)}"
f"[{minutes_passed_since_migration_start if minutes_passed_since_migration_start > 10 else 10}m])",
prometheus=prometheus, metric_name=query.format(vm_name=vm_for_migration_metrics_test.name)
)


Expand Down
6 changes: 4 additions & 2 deletions tests/observability/metrics/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@
REGISTRY_STR,
TIMEOUT_1MIN,
TIMEOUT_2MIN,
TIMEOUT_3MIN,
TIMEOUT_4MIN,
TIMEOUT_5MIN,
TIMEOUT_5SEC,
TIMEOUT_10SEC,
TIMEOUT_15SEC,
TIMEOUT_20SEC,
Expand Down Expand Up @@ -467,8 +469,8 @@ def timestamp_to_seconds(timestamp: str) -> int:

def wait_for_non_empty_metrics_value(prometheus: Prometheus, metric_name: str) -> None:
samples = TimeoutSampler(
wait_timeout=TIMEOUT_5MIN,
sleep=TIMEOUT_30SEC,
wait_timeout=TIMEOUT_3MIN,
sleep=TIMEOUT_5SEC,
func=get_metrics_value,
prometheus=prometheus,
metrics_name=metric_name,
Expand Down
Loading