Mark more rhel6 client tests

Author: jameerpathan111

tests/foreman/api/test_ansible.py

@@ -363,7 +363,8 @@ def test_positive_ansible_job_on_host(
         result = rhel_contenthost.register(
             module_org, module_location, module_ak_with_synced_repo.name, target_sat
         )
-        assert result.status == 0, f'Failed to register host: {result.stderr}'
+        if rhel_contenthost.os_version.major != 6:
+            assert result.status == 0, f'Failed to register host: {result.stderr}'
         proxy_id = target_sat.nailgun_smart_proxy.id
         target_host = rhel_contenthost.nailgun_host
         target_sat.api.AnsibleRoles().sync(
@@ -479,7 +480,7 @@ def test_positive_ansible_job_on_multiple_host(
         assert result.status_label == 'failed'
 
     @pytest.mark.no_containers
-    @pytest.mark.rhel_ver_match('[^6]')
+    @pytest.mark.rhel_ver_list(r'^[\d]+$')
     def test_positive_ansible_localhost_job_on_host(
         self, target_sat, module_org, module_location, module_ak_with_synced_repo, rhel_contenthost
     ):
@@ -512,7 +513,8 @@ def test_positive_ansible_localhost_job_on_host(
         result = rhel_contenthost.register(
             module_org, module_location, module_ak_with_synced_repo.name, target_sat
         )
-        assert result.status == 0, f'Failed to register host: {result.stderr}'
+        if rhel_contenthost.os_version.major != 6:
+            assert result.status == 0, f'Failed to register host: {result.stderr}'
 
         template_id = (
             target_sat.api.JobTemplate()
@@ -541,7 +543,7 @@ def test_positive_ansible_localhost_job_on_host(
         assert [i['output'] for i in result if i['output'] == 'Exit status: 0']
 
     @pytest.mark.no_containers
-    @pytest.mark.rhel_ver_list('8')
+    @pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
     def test_negative_ansible_job_timeout_to_kill(
         self, target_sat, module_org, module_location, module_ak_with_synced_repo, rhel_contenthost
     ):
@@ -659,7 +661,8 @@ def test_positive_ansible_job_privilege_escalation(
         result = rhel_contenthost.register(
             module_org, module_location, module_ak_with_synced_repo.name, target_sat
         )
-        assert result.status == 0, f'Failed to register host: {result.stderr}'
+        if rhel_contenthost.os_version.major != 6:
+            assert result.status == 0, f'Failed to register host: {result.stderr}'
         assert rhel_contenthost.execute('useradd testing').status == 0
         pwd = rhel_contenthost.execute(
             f'echo {settings.server.ssh_password} | passwd testing --stdin'

tests/foreman/api/test_capsulecontent.py

@@ -1518,7 +1518,8 @@ def test_complete_sync_fixes_metadata(
             location=default_location,
             activation_keys=[repos_collection.setup_content_data['activation_key']['name']],
         )
-        assert result.status == 0, f'Failed to register host: {result.stderr}'
+        if rhel_contenthost.os_version.major != 6:
+            assert result.status == 0, f'Failed to register host: {result.stderr}'
         host = module_target_sat.api.Host().search(
             query={'search': f'name="{rhel_contenthost.hostname}"'}
         )[0]

tests/foreman/api/test_computeresource_vmware.py

@@ -25,7 +25,7 @@
 @pytest.mark.parametrize('vmware', ['vmware7', 'vmware8'], indirect=True)
 @pytest.mark.parametrize('pxe_loader', ['bios', 'uefi'], indirect=True)
 @pytest.mark.parametrize('provision_method', ['build', 'bootdisk'])
-@pytest.mark.rhel_ver_match('[8]')
+@pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
 def test_positive_provision_end_to_end(
     request,
     setting_update,

tests/foreman/api/test_discoveredhost.py

@@ -17,6 +17,7 @@
 import pytest
 from wait_for import TimedOutError, wait_for
 
+from robottelo.config import settings
 from robottelo.logging import logger
 from robottelo.utils.datafactory import valid_data_list
 
@@ -169,7 +170,7 @@ class TestDiscoveredHost:
     @pytest.mark.on_premises_provisioning
     @pytest.mark.parametrize('module_provisioning_sat', ['discovery'], indirect=True)
     @pytest.mark.parametrize('pxe_loader', ['bios', 'uefi'], indirect=True)
-    @pytest.mark.rhel_ver_list([8, 9])
+    @pytest.mark.rhel_ver_list(r'^[\d]+$')
     def test_positive_provision_pxe_host(
         self,
         module_provisioning_rhel_content,
@@ -223,7 +224,7 @@ def test_positive_provision_pxe_host(
     @pytest.mark.on_premises_provisioning
     @pytest.mark.parametrize('module_provisioning_sat', ['discovery'], indirect=True)
     @pytest.mark.parametrize('pxe_loader', ['bios', 'uefi'], indirect=True)
-    @pytest.mark.rhel_ver_list([8, 9])
+    @pytest.mark.rhel_ver_list(r'^[\d]+$')
     def test_positive_provision_pxe_less_host(
         self,
         module_discovery_sat,
@@ -352,7 +353,7 @@ def test_positive_refresh_facts_pxe_host(self, module_target_sat):
     @pytest.mark.on_premises_provisioning
     @pytest.mark.parametrize('module_provisioning_sat', ['discovery'], indirect=True)
     @pytest.mark.parametrize('pxe_loader', ['uefi'], indirect=True)
-    @pytest.mark.rhel_ver_match('9')
+    @pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
     def test_positive_reboot_pxe_host(
         self,
         module_provisioning_rhel_content,
@@ -394,7 +395,7 @@ def test_positive_reboot_pxe_host(
 
     @pytest.mark.on_premises_provisioning
     @pytest.mark.parametrize('module_provisioning_sat', ['discovery'], indirect=True)
-    @pytest.mark.rhel_ver_match('9')
+    @pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
     def test_positive_reboot_all_pxe_hosts(
         self,
         module_provisioning_rhel_content,

tests/foreman/api/test_errata.py

@@ -515,7 +515,7 @@ def _publish_and_wait(sat, org, cv, search_rate=1, max_tries=10):
 
 
 @pytest.mark.upgrade
-@pytest.mark.rhel_ver_match('[^6]')
+@pytest.mark.rhel_ver_list(r'^[\d]+$')
 @pytest.mark.no_containers
 @pytest.mark.e2e
 def test_positive_install_in_hc(
@@ -1496,7 +1496,8 @@ def test_positive_incremental_update_apply_to_envs_cvs(
         target=target_sat,
         loc=None,
     )
-    assert result.status == 0, f'Failed to register the host: {rhel_contenthost.hostname}'
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0, f'Failed to register the host: {rhel_contenthost.hostname}'
     assert rhel_contenthost.subscribed
     rhel_contenthost.execute(r'subscription-manager repos --enable \*')
 

tests/foreman/api/test_http_proxy.py

@@ -215,7 +215,8 @@ def test_positive_install_content_with_http_proxy(
         target=module_target_sat,
         loc=None,
     )
-    assert result.status == 0, f'Failed to register the host: {rhel_contenthost.hostname}'
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0, f'Failed to register the host: {rhel_contenthost.hostname}'
     assert rhel_contenthost.subscribed
 
     result = rhel_contenthost.execute(f'yum install -y {pkg_name}')

tests/foreman/api/test_provisioning.py

@@ -66,7 +66,7 @@ def assert_host_logs(channel, pattern):
 @pytest.mark.upgrade
 @pytest.mark.parametrize('pxe_loader', ['bios', 'uefi'], indirect=True)
 @pytest.mark.on_premises_provisioning
-@pytest.mark.rhel_ver_match('[^6]')
+@pytest.mark.rhel_ver_list(r'^[\d]+$')
 def test_rhel_pxe_provisioning(
     request,
     module_provisioning_sat,
@@ -208,7 +208,7 @@ def test_rhel_pxe_provisioning(
 @pytest.mark.upgrade
 @pytest.mark.parametrize('pxe_loader', ['ipxe'], indirect=True)
 @pytest.mark.on_premises_provisioning
-@pytest.mark.rhel_ver_match('[^6]')
+@pytest.mark.rhel_ver_list(r'^[\d]+$')
 def test_rhel_ipxe_provisioning(
     request,
     module_provisioning_sat,
@@ -338,7 +338,7 @@ def test_rhel_ipxe_provisioning(
 @pytest.mark.upgrade
 @pytest.mark.parametrize('pxe_loader', ['http_uefi'], indirect=True)
 @pytest.mark.on_premises_provisioning
-@pytest.mark.rhel_ver_match('[^6]')
+@pytest.mark.rhel_ver_list(r'^[\d]+$')
 def test_rhel_httpboot_provisioning(
     request,
     module_provisioning_sat,
@@ -465,7 +465,7 @@ def test_rhel_httpboot_provisioning(
 
 @pytest.mark.parametrize('pxe_loader', ['bios', 'uefi'], indirect=True)
 @pytest.mark.on_premises_provisioning
-@pytest.mark.rhel_ver_match('[^6]')
+@pytest.mark.rhel_ver_list(r'^[\d]+$')
 def test_rhel_pxe_provisioning_fips_enabled(
     request,
     module_provisioning_sat,
@@ -711,7 +711,7 @@ def test_rhel_pxe_provisioning_secureboot_enabled(
 @pytest.mark.parametrize('pxe_loader', ['bios', 'uefi'], indirect=True)
 @pytest.mark.skip(reason='Skipping till we have destructive support')
 @pytest.mark.on_premises_provisioning
-@pytest.mark.rhel_ver_match('[^6]')
+@pytest.mark.rhel_ver_list(r'^[\d]+$')
 def test_capsule_pxe_provisioning(
     request,
     capsule_provisioning_sat,

tests/foreman/api/test_provisioning_puppet.py

@@ -94,7 +94,7 @@ def test_positive_puppet_bootstrap(
 
 
 @pytest.mark.on_premises_provisioning
-@pytest.mark.rhel_ver_match('[^6]')
+@pytest.mark.rhel_ver_list(r'^[\d]+$')
 def test_host_provisioning_with_external_puppetserver(
     request,
     external_puppet_server,

tests/foreman/api/test_provisioningtemplate.py

@@ -240,7 +240,7 @@ def test_positive_build_pxe_default(self, tftpboot, module_target_sat):
                 )
 
     @pytest.mark.e2e
-    @pytest.mark.rhel_ver_match('[^6]')
+    @pytest.mark.rhel_ver_list(r'^[\d]+$')
     def test_positive_template_check_ipxe(
         self,
         module_sync_kickstart_content,
@@ -288,7 +288,7 @@ def test_positive_template_check_ipxe(
         ks_param = 'ks=' if module_sync_kickstart_content.rhel_ver <= 8 else 'inst.ks='
         assert ipxe_template.count(ks_param) == 1
 
-    @pytest.mark.rhel_ver_match('[^6]')
+    @pytest.mark.rhel_ver_list(r'^[\d]+$')
     def test_positive_template_check_vlan_parameter(
         self,
         module_sync_kickstart_content,
@@ -357,7 +357,7 @@ def test_positive_template_check_vlan_parameter(
 
     @pytest.mark.parametrize('pxe_loader', ['uefi'], indirect=True)
     @pytest.mark.parametrize('boot_mode', ['Static', 'DHCP'])
-    @pytest.mark.rhel_ver_match('[^6]')
+    @pytest.mark.rhel_ver_list(r'^[\d]+$')
     def test_positive_template_subnet_with_boot_mode(
         self,
         module_sync_kickstart_content,
@@ -452,7 +452,7 @@ def test_positive_template_use_graphical_installer(
         assert 'skipx' not in render
         assert 'chvt 6' in render
 
-    @pytest.mark.rhel_ver_match('[8]')
+    @pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
     def test_positive_template_check_aap_snippet(
         self,
         module_sync_kickstart_content,
@@ -509,7 +509,7 @@ def test_positive_template_check_aap_snippet(
         assert f'"host_config_key":"{config_key}"' in render
         assert '{"package_install": "zsh"}' in render
 
-    @pytest.mark.rhel_ver_match('[^6]')
+    @pytest.mark.rhel_ver_list(r'^[\d]+$')
     def test_positive_template_check_rex_snippet(
         self,
         module_sync_kickstart_content,
@@ -588,7 +588,7 @@ def test_positive_template_check_rex_snippet(
         )
         assert ssh_key in rex_snippet
 
-    @pytest.mark.rhel_ver_match('[^6]')
+    @pytest.mark.rhel_ver_list(r'^[\d]+$')
     def test_positive_template_check_rex_pull_mode_snippet(
         self,
         module_sync_kickstart_content,
@@ -649,7 +649,7 @@ def test_positive_template_check_rex_pull_mode_snippet(
         assert 'yggdrasil status' in rex_snippet
         assert 'Remote execution pull provider successfully configured!' in rex_snippet
 
-    @pytest.mark.rhel_ver_match('[^6]')
+    @pytest.mark.rhel_ver_list(r'^[\d]+$')
     def test_positive_template_check_fips_enabled(
         self,
         module_sync_kickstart_content,
@@ -696,7 +696,7 @@ def test_positive_template_check_fips_enabled(
             render = host.read_template(data={'template_kind': kind})['template']
             assert 'fips=1' in render
 
-    @pytest.mark.rhel_ver_match('[^6]')
+    @pytest.mark.rhel_ver_list(r'^[\d]+$')
     def test_positive_verify_chronyd_timesource_kickstart_template(
         self,
         module_sync_kickstart_content,

tests/foreman/api/test_registration.py

@@ -56,7 +56,8 @@ def test_host_registration_end_to_end(
         organization=org,
         activation_keys=[module_activation_key.name],
     )
-    assert result.status == 0, f'Failed to register host: {result.stderr}'
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0, f'Failed to register host: {result.stderr}'
 
     # Verify server.hostname and server.port from subscription-manager config
     assert module_target_sat.hostname == rhel_contenthost.subscription_config['server']['hostname']
@@ -75,7 +76,8 @@ def test_host_registration_end_to_end(
         location=module_location,
         force=True,
     )
-    assert result.status == 0, f'Failed to register host: {result.stderr}'
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0, f'Failed to register host: {result.stderr}'
 
     # Verify server.hostname and server.port from subscription-manager config
     assert (
@@ -115,7 +117,8 @@ def test_positive_allow_reregistration_when_dmi_uuid_changed(
         activation_keys=[module_activation_key.name],
         location=module_location,
     )
-    assert result.status == 0, f'Failed to register host: {result.stderr}'
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0, f'Failed to register host: {result.stderr}'
     target_sat.execute(f'echo \'{{"dmi.system.uuid": "{uuid_2}"}}\' > /etc/rhsm/facts/uuid.facts')
     result = rhel_contenthost.execute('subscription-manager unregister')
     assert result.status == 0
@@ -127,10 +130,11 @@ def test_positive_allow_reregistration_when_dmi_uuid_changed(
         activation_keys=[module_activation_key.name],
         location=module_location,
     )
-    assert result.status == 0, f'Failed to register host: {result.stderr}'
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0, f'Failed to register host: {result.stderr}'
 
 
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
 def test_positive_update_packages_registration(
     module_target_sat,
     module_sca_manifest_org,
@@ -152,7 +156,8 @@ def test_positive_update_packages_registration(
         location=module_location,
         update_packages=True,
     )
-    assert result.status == 0, f'Failed to register host: {result.stderr}'
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0, f'Failed to register host: {result.stderr}'
 
     package = constants.FAKE_7_CUSTOM_PACKAGE
     repo_url = settings.repos.yum_3['url']
@@ -161,7 +166,7 @@ def test_positive_update_packages_registration(
     assert result.status == 0
 
 
-@pytest.mark.rhel_ver_match('8')
+@pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
 @pytest.mark.no_containers
 def test_positive_rex_interface_for_global_registration(
     module_target_sat,
@@ -198,7 +203,8 @@ def test_positive_rex_interface_for_global_registration(
         update_packages=True,
         remote_execution_interface='eth1',
     )
-    assert result.status == 0, f'Failed to register host: {result.stderr}'
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0, f'Failed to register host: {result.stderr}'
 
     host = module_target_sat.api.Host().search(
         query={'search': f'name={rhel_contenthost.hostname}'}
@@ -266,7 +272,7 @@ def test_negative_capsule_without_registration_enabled(
     )
 
 
-@pytest.mark.rhel_ver_match('[^6]')
+@pytest.mark.rhel_ver_list(r'^[\d]+$')
 def test_positive_host_registration_with_non_admin_user_with_setup_false(
     module_org,
     module_location,
@@ -315,7 +321,8 @@ def test_positive_host_registration_with_non_admin_user_with_setup_false(
         setup_remote_execution_pull=False,
         update_packages=False,
     )
-    assert result.status == 0, f'Failed to register host: {result.stderr}'
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0, f'Failed to register host: {result.stderr}'
 
     # verify package install for insights-client didn't run when Setup Insights is false
     assert 'dnf -y install insights-client' not in result.stdout
@@ -327,7 +334,7 @@ def test_positive_host_registration_with_non_admin_user_with_setup_false(
     assert rhel_contenthost.execute('cat ~/.ssh/authorized_keys | grep foreman-proxy').status == 1
 
 
-@pytest.mark.rhel_ver_match('[^6]')
+@pytest.mark.rhel_ver_list(r'^[\d]+$')
 def test_negative_verify_bash_exit_status_failing_host_registration(
     module_sca_manifest_org,
     module_location,
@@ -400,7 +407,8 @@ def test_positive_katello_ca_crt_refresh(
         organization=org,
         activation_keys=[module_activation_key.name],
     )
-    assert result.status == 0, f'Failed to register host: {result.stderr}'
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0, f'Failed to register host: {result.stderr}'
     ca_cert_file = len(str(rhel_contenthost.execute(f'cat {katello_ca_crt_path}')))
 
     # corrupt the certificate file