Skip to content

Commit 9bb8f10

Browse files
committed
[Observability] Mark arm64 tests
Signed-off-by: Harel Meir <[email protected]>
1 parent 80166b4 commit 9bb8f10

24 files changed

+47
-7
lines changed

tests/observability/metrics/test_cdi_metrics.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
from tests.observability.utils import validate_metrics_value
55
from utilities.constants import CDI_OPERATOR
66

7+
pytestmark = [pytest.mark.arm64]
8+
79

810
@pytest.mark.polarion("CNV-10557")
911
def test_kubevirt_cdi_clone_pods_high_restart(

tests/observability/metrics/test_cnao_metrics.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
)
77
from tests.observability.utils import validate_metrics_value
88

9+
pytestmark = pytest.mark.arm64
10+
911

1012
class TestSSPMetrics:
1113
@pytest.mark.parametrize(

tests/observability/metrics/test_cpu_usage_metrics.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717

1818
class TestCpuUsageMetrics:
19+
@pytest.mark.arm64
1920
@pytest.mark.parametrize(
2021
"query",
2122
[

tests/observability/metrics/test_general_metrics.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ def fedora_vm_without_name_in_label(
4545
yield vm
4646

4747

48+
@pytest.mark.arm64
4849
class TestVmiNodeCpuAffinityLinux:
4950
@pytest.mark.parametrize(
5051
"golden_image_data_volume_scope_class, vm_from_template_scope_class",
@@ -84,6 +85,7 @@ def test_kubevirt_vmi_node_cpu_affinity_windows_vm(self, prometheus, windows_vm_
8485
)
8586

8687

88+
@pytest.mark.arm64
8789
class TestVmNameInLabel:
8890
@pytest.mark.polarion("CNV-8582")
8991
def test_vm_name_in_virt_launcher_label(self, fedora_vm_without_name_in_label):
@@ -101,6 +103,7 @@ def test_vm_name_in_virt_launcher_label(self, fedora_vm_without_name_in_label):
101103
)
102104

103105

106+
@pytest.mark.arm64
104107
class TestVirtHCOSingleStackIpv6:
105108
@pytest.mark.ipv6
106109
@pytest.mark.polarion("CNV-11740")

tests/observability/metrics/test_instance_type_metrics.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
)
2323
from utilities.virt import migrate_vm_and_verify, running_vm
2424

25+
pytestmark = pytest.mark.arm64
26+
2527

2628
@pytest.fixture(scope="class")
2729
def migrated_instance_type_vm(prometheus, rhel_vm_with_cluster_instance_type_and_preference):

tests/observability/metrics/test_key_metrics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
KUBEVIRT_VMI_VCPU_WAIT_SECONDS_TOTAL,
1010
)
1111

12-
pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno]
12+
pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.arm64]
1313
STRESS_NG = "stress-ng --cpu 8 --io 2 --vm 2 --vm-bytes 128M --timeout 60s &>1 &"
1414
STORAGE_WRITE = "for i in {1..10}; do head -c 10M </dev/urandom > randfile$i; done"
1515
STORAGE_READ = "for i in {1..20}; do cat /etc/hosts; done"

tests/observability/metrics/test_metrics.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ def test_cnv_installation_with_hco_cr_metrics(
143143
)
144144

145145

146+
@pytest.mark.arm64
146147
class TestVMIMetricsLinuxVms:
147148
@pytest.mark.polarion("CNV-8262")
148149
def test_vmi_domain_total_memory_bytes(
@@ -232,6 +233,7 @@ def test_metric_kubevirt_vm_info_windows(self, prometheus, windows_vm_for_test,
232233
)
233234

234235

236+
@pytest.mark.arm64
235237
class TestMemoryDeltaFromRequestedBytes:
236238
@pytest.mark.polarion("CNV-11632")
237239
def test_metric_kubevirt_memory_delta_from_requested_bytes_working_set(
@@ -278,6 +280,7 @@ def test_metric_cnv_abnormal_rss(self, prometheus, virt_api_rss_memory, virt_api
278280
)
279281

280282

283+
@pytest.mark.arm64
281284
class TestKubeDaemonsetStatusNumberReady:
282285
@pytest.mark.polarion("CNV-11727")
283286
def test_kube_daemonset_status_number_ready(self, prometheus, virt_handler_pods_count):
@@ -288,6 +291,7 @@ def test_kube_daemonset_status_number_ready(self, prometheus, virt_handler_pods_
288291
)
289292

290293

294+
@pytest.mark.arm64
291295
class TestKubevirtApiRequestDeprecatedTotal:
292296
@pytest.mark.polarion("CNV-11739")
293297
def test_metric_kubevirt_api_request_deprecated_total(self, prometheus, generated_api_deprecated_requests):
@@ -298,6 +302,7 @@ def test_metric_kubevirt_api_request_deprecated_total(self, prometheus, generate
298302
)
299303

300304

305+
@pytest.mark.arm64
301306
class TestAllocatableNodes:
302307
@pytest.mark.polarion("CNV-11818")
303308
def test_metirc_kubevirt_allocatable_nodes(self, prometheus, allocatable_nodes):

tests/observability/metrics/test_metrics_cpu.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
wait_for_metric_vmi_request_cpu_cores_output,
77
)
88

9-
pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno]
9+
pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.arm64]
1010

1111

1212
@pytest.mark.usefixtures("initial_metric_cpu_value_zero")

tests/observability/metrics/test_migration_metrics.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
from utilities.infra import get_node_selector_dict, get_pods
2323
from utilities.virt import VirtualMachineForTests, fedora_vm_body, running_vm
2424

25+
pytestmark = pytest.mark.arm64
26+
2527

2628
def delete_failed_migration_target_pod(admin_client, namespace, vm_name):
2729
"""

tests/observability/metrics/test_network_metrics.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
validate_vmi_network_receive_and_transmit_packets_total,
66
)
77

8+
pytestmark = pytest.mark.arm64
9+
810

911
@pytest.mark.parametrize(
1012
"vm_for_test",

tests/observability/metrics/test_prometheus_service_monitor.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
from utilities.constants import VIRT_OPERATOR
55

6+
pytestmark = pytest.mark.arm64
7+
68

79
@pytest.fixture()
810
def kubevirt_prometheus_service_monitor_list(admin_client):

tests/observability/metrics/test_recording_rules.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from utilities.constants import KUBEVIRT_VIRT_OPERATOR_UP, VIRT_API, VIRT_CONTROLLER, VIRT_HANDLER, VIRT_OPERATOR
55

6-
pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno]
6+
pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.arm64]
77

88
virt_label_dict = {
99
VIRT_API: f"{Resource.ApiGroup.KUBEVIRT_IO}={VIRT_API}",

tests/observability/metrics/test_ssp_metrics.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
from utilities.hco import ResourceEditorValidateHCOReconcile
1616
from utilities.virt import VirtualMachineForTests
1717

18+
pytestmark = pytest.mark.arm64
19+
1820
KUBEVIRT_SSP_OPERATOR_UP = "kubevirt_ssp_operator_up"
1921
KUBEVIRT_SSP_TEMPLATE_VALIDATOR_UP = "kubevirt_ssp_template_validator_up"
2022
KUBEVIRT_SSP_COMMON_TEMPLATES_RESTORED_INCREASE = "kubevirt_ssp_common_templates_restored_increase"

tests/observability/metrics/test_total_created_vms.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
from tests.observability.metrics.utils import wait_for_expected_metric_value_sum
55
from utilities.constants import RHEL_WITH_INSTANCETYPE_AND_PREFERENCE
66

7+
pytestmark = pytest.mark.arm64
8+
79

810
class TestTotalCreatedInstanceType:
911
@pytest.mark.polarion("CNV-10771")

tests/observability/metrics/test_version_metrics.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
from tests.observability.metrics.utils import assert_virtctl_version_equal_metric_output
77
from utilities.infra import run_virtctl_command
88

9+
pytestmark = pytest.mark.arm64
10+
911

1012
@pytest.fixture()
1113
def virtctl_go_kube_server_version():

tests/observability/metrics/test_virt_resource_mutation_metrics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
VIRTCTL_CLI_DOWNLOADS,
2727
)
2828

29-
pytestmark = pytest.mark.sno
29+
pytestmark = [pytest.mark.sno, pytest.mark.arm64]
3030
LOGGER = logging.getLogger(__name__)
3131

3232
COMPONENT_CONFIG = {

tests/observability/metrics/test_vm_template_metrics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from tests.observability.metrics import utils
55
from tests.os_params import RHEL_LATEST, RHEL_LATEST_LABELS, RHEL_LATEST_OS
66

7-
pytestmark = pytest.mark.sno
7+
pytestmark = [pytest.mark.sno, pytest.mark.arm64]
88
METRIC_QUERY = 'kubevirt_vmi_phase_count{{os="{os_name}", flavor="{flavor}", workload="{workload}"}}'
99
SUM_QUERY = f"sum({METRIC_QUERY})"
1010

tests/observability/metrics/test_vms_metrics.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444

4545
LOGGER = logging.getLogger(__name__)
4646

47+
pytestmark = pytest.mark.arm64
48+
4749

4850
def get_last_transition_time(vm):
4951
for condition in vm.instance.get("status", {}).get("conditions"):

tests/observability/network/test_cnao_observability.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
from tests.observability.utils import validate_metrics_value
99
from utilities.constants import CLUSTER_NETWORK_ADDONS_OPERATOR, TIMEOUT_5MIN
1010

11+
pytestmark = pytest.mark.arm64
12+
1113

1214
@pytest.mark.usefixtures("disabled_virt_operator", "invalid_cnao_operator")
1315
class TestCnaoDown:

tests/observability/runbook_url/test_runbook_url.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
LOGGER = logging.getLogger(__name__)
1010

11+
pytestmark = pytest.mark.arm64
12+
1113

1214
def get_downstream_runbook_url(alert_name):
1315
return f"https://github.com/openshift/runbooks/blob/master/alerts/openshift-virtualization-operator/{alert_name}.md"

tests/observability/storage/test_hpp_observability.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
)
1111
from utilities.monitoring import validate_alerts
1212

13-
pytestmark = [pytest.mark.usefixtures("skip_if_hpp_not_exist", "hpp_condition_available_scope_module")]
13+
pytestmark = [
14+
pytest.mark.usefixtures("skip_if_hpp_not_exist", "hpp_condition_available_scope_module"),
15+
pytest.mark.arm64,
16+
]
1417

1518
LOGGER = logging.getLogger(__name__)
1619

tests/observability/test_healthy_cluster_no_alerts.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
from tests.observability.constants import SSP_ALERTS_LIST, VIRT_ALERTS_LIST
44
from tests.observability.utils import verify_no_listed_alerts_on_cluster
55

6+
pytestmark = pytest.mark.arm64
7+
68

79
@pytest.mark.polarion("CNV-7610")
810
@pytest.mark.order(0)

tests/observability/virt/test_virt_controller_ready.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
from tests.observability.utils import validate_metrics_value
44
from utilities.constants import VIRT_CONTROLLER
55

6+
pytestmark = pytest.mark.arm64
7+
68

79
@pytest.mark.usefixtures("disabled_virt_operator")
810
class TestVirtControllerReady:

tests/observability/virt/test_virt_metrics_alerts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
VIRT_CONTROLLER_REST_ERRORS_HIGH = "VirtControllerRESTErrorsHigh"
1717

18-
pytestmark = pytest.mark.usefixtures("initial_virt_operator_replicas")
18+
pytestmark = [pytest.mark.usefixtures("initial_virt_operator_replicas"), pytest.mark.arm64]
1919

2020

2121
@pytest.mark.usefixtures(

0 commit comments

Comments
 (0)