Merge branch 'main' into testCustomCliDownload

Author: OhadRevah

tests/install_upgrade_operators/console_cli_download/test_custom_console_cli_download.py

@@ -44,7 +44,6 @@ def test_custom_console_cli_download(
     @pytest.mark.polarion("CNV-12278")
     def test_custom_console_cli_download_links_downloadable(
         self,
-        admin_client,
         tmpdir,
         all_virtctl_urls_scope_function,
     ):

tests/install_upgrade_operators/product_install/test_install_openshift_virtualization.py

@@ -31,7 +31,7 @@
 CNV_ALERT_CLEANUP_TEST = "test_cnv_installation_alert_cleanup"
 LOGGER = logging.getLogger(__name__)
 
-pytestmark = [pytest.mark.install]
+pytestmark = [pytest.mark.install, pytest.mark.s390x]
 
 
 @pytest.mark.polarion("CNV-10072")