Merge branch 'main' into testCustomCliDownload

Author: OhadRevah

tests/observability/metrics/test_cdi_metrics.py

@@ -4,6 +4,7 @@
 
 
 @pytest.mark.polarion("CNV-11744")
+@pytest.mark.s390x
 def test_metric_kubevirt_cdi_storageprofile_info(prometheus, storage_class_labels_for_testing):
     expected_metric_labels_and_values(
         values_from_prometheus=get_metric_labels_non_empty_value(

tests/observability/metrics/test_general_metrics.py

@@ -67,6 +67,7 @@ class TestVmiNodeCpuAffinityLinux:
         indirect=True,
     )
     @pytest.mark.polarion("CNV-7295")
+    @pytest.mark.s390x
     def test_kubevirt_vmi_node_cpu_affinity(self, prometheus, vm_from_template_scope_class):
         validate_vmi_node_cpu_affinity_with_prometheus(
             vm=vm_from_template_scope_class,
@@ -86,6 +87,7 @@ def test_kubevirt_vmi_node_cpu_affinity_windows_vm(self, prometheus, windows_vm_
 
 class TestVmNameInLabel:
     @pytest.mark.polarion("CNV-8582")
+    @pytest.mark.s390x
     def test_vm_name_in_virt_launcher_label(self, fedora_vm_without_name_in_label):
         """
         when VM created from vm.yaml,for the kind=VirtualMachine, doesn't have
@@ -104,6 +106,7 @@ def test_vm_name_in_virt_launcher_label(self, fedora_vm_without_name_in_label):
 class TestVirtHCOSingleStackIpv6:
     @pytest.mark.ipv6
     @pytest.mark.polarion("CNV-11740")
+    @pytest.mark.s390x
     def test_metric_kubevirt_hco_single_stack_ipv6(self, prometheus, ipv6_single_stack_cluster):
         validate_metrics_value(
             prometheus=prometheus,

tests/observability/metrics/test_metrics.py

@@ -18,6 +18,7 @@
 
 class TestMetricsLinux:
     @pytest.mark.polarion("CNV-11906")
+    @pytest.mark.s390x
     def test_cnv_vmi_monitoring_metrics_linux_vm(
         self, prometheus, single_metric_vm, cnv_vmi_monitoring_metrics_matrix__function__
     ):
@@ -51,6 +52,7 @@ def test_cnv_vmi_monitoring_metrics_windows_vm(
 
 
 @pytest.mark.polarion("CNV-10438")
+@pytest.mark.s390x
 def test_cnv_installation_with_hco_cr_metrics(
     prometheus,
 ):
@@ -62,6 +64,7 @@ def test_cnv_installation_with_hco_cr_metrics(
 
 class TestVMIMetricsLinuxVms:
     @pytest.mark.polarion("CNV-11400")
+    @pytest.mark.s390x
     def test_kubevirt_vmi_info(self, prometheus, single_metric_vm, vmi_guest_os_kernel_release_info_linux):
         compare_kubevirt_vmi_info_metric_with_vm_info(
             prometheus=prometheus,
@@ -71,6 +74,7 @@ def test_kubevirt_vmi_info(self, prometheus, single_metric_vm, vmi_guest_os_kern
         )
 
     @pytest.mark.polarion("CNV-11862")
+    @pytest.mark.s390x
     def test_metric_kubevirt_vm_info(self, prometheus, single_metric_vm, linux_vm_info_to_compare):
         compare_kubevirt_vmi_info_metric_with_vm_info(
             prometheus=prometheus,

tests/observability/metrics/test_metrics_cpu.py

@@ -12,16 +12,19 @@
 @pytest.mark.usefixtures("initial_metric_cpu_value_zero")
 class TestMetricsCpu:
     @pytest.mark.polarion("CNV-9649")
+    @pytest.mark.s390x
     def test_verify_metrics_vmi_request_cpu_sum(self, prometheus, running_metric_vm):
         wait_for_metric_vmi_request_cpu_cores_output(prometheus=prometheus, expected_cpu=ONE_CPU_CORES)
 
     @pytest.mark.polarion("CNV-9653")
     @pytest.mark.order(after="test_verify_metrics_vmi_request_cpu_sum")
+    @pytest.mark.s390x
     def test_verify_metrics_stopped_vm(self, prometheus, stopped_metrics_vm):
         wait_for_metric_vmi_request_cpu_cores_output(prometheus=prometheus, expected_cpu=ZERO_CPU_CORES)
 
     @pytest.mark.polarion("CNV-9652")
     @pytest.mark.order(after="test_verify_metrics_stopped_vm")
+    @pytest.mark.s390x
     def test_verify_metrics_paused_vm(
         self,
         prometheus,
@@ -34,5 +37,6 @@ def test_verify_metrics_paused_vm(
 @pytest.mark.usefixtures("initial_metric_cpu_value_zero")
 class TestMetricsCpuErrorState:
     @pytest.mark.polarion("CNV-9654")
+    @pytest.mark.s390x
     def test_verify_metrics_error_state_vm(self, prometheus, error_state_vm):
         wait_for_metric_vmi_request_cpu_cores_output(prometheus=prometheus, expected_cpu=ZERO_CPU_CORES)

tests/observability/metrics/test_migration_metrics.py

@@ -24,6 +24,7 @@
 
 class TestMigrationMetrics:
     @pytest.mark.polarion("CNV-8480")
+    @pytest.mark.s390x
     def test_migration_metrics_scheduling(
         self,
         admin_client,
@@ -41,6 +42,7 @@ def test_migration_metrics_scheduling(
         )
 
     @pytest.mark.polarion("CNV-8481")
+    @pytest.mark.s390x
     def test_migration_metrics_running(
         self,
         prometheus,
@@ -81,6 +83,7 @@ class TestKubevirtVmiMigrationMetrics:
         ],
     )
     @pytest.mark.jira("CNV-57777", run=False)
+    @pytest.mark.s390x
     def test_kubevirt_vmi_migration_metrics(
         self,
         prometheus,
@@ -106,6 +109,7 @@ def test_kubevirt_vmi_migration_metrics(
 
 class TestKubevirtVmiMigrationStartAndEnd:
     @pytest.mark.polarion("CNV-11809")
+    @pytest.mark.s390x
     def test_metric_kubevirt_vmi_migration_start_time_seconds(
         self,
         prometheus,
@@ -123,6 +127,7 @@ def test_metric_kubevirt_vmi_migration_start_time_seconds(
         )
 
     @pytest.mark.polarion("CNV-11810")
+    @pytest.mark.s390x
     def test_metric_kubevirt_vmi_migration_end_time_seconds(
         self,
         prometheus,

tests/observability/metrics/test_network_metrics.py

@@ -15,6 +15,7 @@
 @pytest.mark.usefixtures("vm_for_test", "linux_vm_for_test_interface_name")
 class TestVmiNetworkMetricsLinux:
     @pytest.mark.polarion("CNV-11177")
+    @pytest.mark.s390x
     def test_kubevirt_vmi_network_traffic_bytes_total(
         self, prometheus, vm_for_test, linux_vm_for_test_interface_name, generated_network_traffic
     ):

tests/observability/metrics/test_prometheus_service_monitor.py

@@ -21,10 +21,12 @@ def kubevirt_service_monitor_namespace(kubevirt_hyperconverged_spec_scope_functi
 
 class TestPrometheusServiceMonitor:
     @pytest.mark.polarion("CNV-9287")
+    @pytest.mark.s390x
     def test_kubevirt_service_monitor_namespace(self, kubevirt_service_monitor_namespace, hco_namespace):
         assert kubevirt_service_monitor_namespace == hco_namespace.name
 
     @pytest.mark.polarion("CNV-9264")
+    @pytest.mark.s390x
     def test_prometheus_service_monitor_in_our_namespace(
         self,
         kubevirt_prometheus_service_monitor_list,

tests/observability/metrics/test_recording_rules.py

@@ -50,6 +50,7 @@
     ],
     indirect=True,
 )
+@pytest.mark.s390x
 def test_virt_recording_rules(
     prometheus,
     admin_client,
@@ -97,6 +98,7 @@ def test_virt_recording_rules(
     ],
     indirect=True,
 )
+@pytest.mark.s390x
 def test_virt_up_recording_rules(
     prometheus,
     admin_client,

tests/observability/metrics/test_ssp_metrics.py

@@ -61,6 +61,7 @@ def created_multiple_failed_vms(
 
 class TestSSPTemplate:
     @pytest.mark.polarion("CNV-11356")
+    @pytest.mark.s390x
     def test_metric_kubevirt_ssp_common_templates_restored_increase(self, prometheus, template_modified):
         validate_metric_value_within_range(
             prometheus=prometheus,
@@ -84,6 +85,7 @@ def test_metric_kubevirt_ssp_common_templates_restored_increase(self, prometheus
         ],
         indirect=["scaled_deployment"],
     )
+    @pytest.mark.s390x
     def test_metrics_kubevirt_ssp_operator_validator_up(
         self, prometheus, paused_ssp_operator, scaled_deployment, metric_name
     ):
@@ -94,6 +96,7 @@ def test_metrics_kubevirt_ssp_operator_validator_up(
         )
 
     @pytest.mark.polarion("CNV-11357")
+    @pytest.mark.s390x
     def test_metric_kubevirt_ssp_operator_reconcile_succeeded_aggregated(
         self, prometheus, paused_ssp_operator, template_validator_finalizer, deleted_ssp_operator_pod
     ):
@@ -121,6 +124,7 @@ def test_metric_kubevirt_ssp_operator_reconcile_succeeded_aggregated(
 @pytest.mark.usefixtures("initiate_metric_value", "instance_type_for_test_scope_class", "created_multiple_failed_vms")
 class TestSSPTemplateValidatorRejected:
     @pytest.mark.polarion("CNV-11310")
+    @pytest.mark.s390x
     def test_metric_kubevirt_ssp_template_validator_rejected_increase(self, prometheus, initiate_metric_value):
         validate_metric_value_with_round_down(
             prometheus=prometheus,

tests/observability/metrics/test_version_metrics.py

@@ -23,6 +23,7 @@ def virtctl_go_kube_server_version():
 
 
 @pytest.mark.polarion("CNV-11017")
+@pytest.mark.s390x
 def test_kubevirt_info_version(prometheus, virtctl_go_kube_server_version):
     metric_result_output = prometheus.query_sampler(query="kubevirt_info")
     assert_virtctl_version_equal_metric_output(