Don't include tracer, pull-provider, yggdrasil

Author: jameerpathan111

tests/foreman/api/test_ansible.py

@@ -334,7 +334,7 @@ class TestAnsibleREX:
     @pytest.mark.e2e
     @pytest.mark.pit_client
     @pytest.mark.no_containers
-    @pytest.mark.rhel_ver_list(r'^[\d]+$')
+    @pytest.mark.rhel_ver_match('[^6]')
     def test_positive_ansible_job_on_host(
         self, target_sat, module_org, module_location, module_ak_with_synced_repo, rhel_contenthost
     ):
@@ -357,14 +357,16 @@ def test_positive_ansible_job_on_host(
         :BZ: 2164400
         """
         SELECTED_ROLE = 'RedHatInsights.insights-client'
-        if rhel_contenthost.os_version.major <= 7:
-            rhel_contenthost.create_custom_repos(rhel7=settings.repos.rhel7_os)
+        rhelver = rhel_contenthost.os_version.major
+        if rhelver <= 7:
+            rhel_contenthost.create_custom_repos(**settings.repos[f'rhel{rhelver}_os'])
             assert rhel_contenthost.execute('yum install -y insights-client').status == 0
         result = rhel_contenthost.register(
             module_org, module_location, module_ak_with_synced_repo.name, target_sat
         )
-        if rhel_contenthost.os_version.major != 6:
+        if rhelver != 6:
             assert result.status == 0, f'Failed to register host: {result.stderr}'
+        assert rhel_contenthost.subscribed
         proxy_id = target_sat.nailgun_smart_proxy.id
         target_host = rhel_contenthost.nailgun_host
         target_sat.api.AnsibleRoles().sync(
@@ -438,7 +440,9 @@ def test_positive_ansible_job_on_multiple_host(
             result = host.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 host.os_version.major != 6:
+                assert result.status == 0, f'Failed to register host: {result.stderr}'
+            assert host.subscribed
             proxy_id = target_sat.nailgun_smart_proxy.id
             target_host = host.nailgun_host
             target_sat.api.AnsibleRoles().sync(
@@ -515,7 +519,7 @@ def test_positive_ansible_localhost_job_on_host(
         )
         if rhel_contenthost.os_version.major != 6:
             assert result.status == 0, f'Failed to register host: {result.stderr}'
-
+        assert rhel_contenthost.subscribed
         template_id = (
             target_sat.api.JobTemplate()
             .search(query={'search': 'name="Ansible - Run playbook"'})[0]
@@ -577,8 +581,9 @@ def test_negative_ansible_job_timeout_to_kill(
         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.subscribed
         template_id = (
             target_sat.api.JobTemplate()
             .search(query={'search': 'name="Ansible - Run playbook"'})[0]
@@ -663,6 +668,7 @@ def test_positive_ansible_job_privilege_escalation(
         )
         if rhel_contenthost.os_version.major != 6:
             assert result.status == 0, f'Failed to register host: {result.stderr}'
+        assert rhel_contenthost.subscribed
         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_errata.py

@@ -579,9 +579,10 @@ def test_positive_install_in_hc(
             target=target_sat,
             loc=None,
         )
-        assert result.status == 0, (
-            f'Failed to register the host - {client.hostname}: {result.stderr}'
-        )
+        if client.os_version.major != 6:
+            assert result.status == 0, (
+                f'Failed to register the host - {client.hostname}: {result.stderr}'
+            )
         client.add_rex_key(satellite=target_sat)
         assert client.subscribed
         client.run(r'subscription-manager repos --enable \*')

tests/foreman/api/test_provisioningtemplate.py

@@ -588,7 +588,7 @@ def test_positive_template_check_rex_snippet(
         )
         assert ssh_key in rex_snippet
 
-    @pytest.mark.rhel_ver_list(r'^[\d]+$')
+    @pytest.mark.rhel_ver_match('[^6]')
     def test_positive_template_check_rex_pull_mode_snippet(
         self,
         module_sync_kickstart_content,

tests/foreman/api/test_registration.py

@@ -272,7 +272,7 @@ def test_negative_capsule_without_registration_enabled(
     )
 
 
-@pytest.mark.rhel_ver_list(r'^[\d]+$')
+@pytest.mark.rhel_ver_match('[^6]')
 def test_positive_host_registration_with_non_admin_user_with_setup_false(
     module_org,
     module_location,

tests/foreman/api/test_remoteexecution.py

@@ -38,7 +38,7 @@ def test_positive_find_capsule_upgrade_playbook(target_sat):
 
 
 @pytest.mark.no_containers
-@pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
+@pytest.mark.rhel_ver_match('[^6]')
 @pytest.mark.parametrize(
     'setting_update',
     ['remote_execution_global_proxy=False'],
@@ -171,7 +171,7 @@ def test_negative_time_to_pickup(
 
 
 @pytest.mark.no_containers
-@pytest.mark.rhel_ver_list([settings.content_host.default_rhel_version])
+@pytest.mark.rhel_ver_match('[^6]')
 @pytest.mark.parametrize(
     'setting_update',
     ['remote_execution_global_proxy=False'],

tests/foreman/api/test_reporttemplates.py

@@ -388,7 +388,8 @@ def test_positive_applied_errata(
     result = rhel_contenthost.register(
         function_org, function_location, activation_key.name, target_sat
     )
-    assert f'The registered system name is: {rhel_contenthost.hostname}' in result.stdout
+    if rhel_contenthost.os_version.major != 6:
+        assert f'The registered system name is: {rhel_contenthost.hostname}' in result.stdout
     assert rhel_contenthost.subscribed
     rhel_contenthost.execute(r'subscription-manager repos --enable \*')
     assert rhel_contenthost.execute(f'yum install -y {FAKE_1_CUSTOM_PACKAGE}').status == 0
@@ -465,7 +466,8 @@ def test_positive_applied_errata_report_with_invalid_errata(
     result = rhel_contenthost.register(
         function_org, function_location, activation_key.name, target_sat
     )
-    assert f'The registered system name is: {rhel_contenthost.hostname}' in result.stdout
+    if rhel_contenthost.os_version.major != 6:
+        assert f'The registered system name is: {rhel_contenthost.hostname}' in result.stdout
     assert rhel_contenthost.subscribed
     rhel_contenthost.execute(r'subscription-manager repos --enable \*')
     assert rhel_contenthost.execute(f'yum install -y {FAKE_1_CUSTOM_PACKAGE}').status == 0
@@ -542,7 +544,8 @@ def test_positive_applied_errata_by_search(
         .description
     )
     result = rhel_contenthost.register(function_org, None, activation_key.name, target_sat)
-    assert f'The registered system name is: {rhel_contenthost.hostname}' in result.stdout
+    if rhel_contenthost.os_version.major != 6:
+        assert f'The registered system name is: {rhel_contenthost.hostname}' in result.stdout
     assert rhel_contenthost.subscribed
     rhel_contenthost.execute(r'subscription-manager repos --enable \*')
     assert rhel_contenthost.execute(f'yum install -y {FAKE_1_CUSTOM_PACKAGE}').status == 0
@@ -636,8 +639,9 @@ def test_positive_applied_errata_for_specific_hosts(
     for host_info in [RHSA, RHBA]:
         chost = host_info['host']
         result = chost.register(module_org, None, activation_key.name, module_target_sat)
-        assert f'The registered system name is: {chost.hostname}' in result.stdout
-        assert chost.subscribed
+        if chost.os_version.major != 6:
+            assert f'The registered system name is: {chost.hostname}' in result.stdout
+            assert chost.subscribed
         assert chost.execute(f'yum install -y {host_info["outdated_pkg"]}').status == 0
 
     # now each erratum is applicable to one host,
@@ -869,7 +873,8 @@ def test_positive_generate_job_report(setup_content, module_target_sat, content_
     for host in content_hosts:
         host.register(org, None, ak.name, module_target_sat)
         host.add_rex_key(module_target_sat)
-        assert host.subscribed
+        if host.os_version.major != 6:
+            assert host.subscribed
         # Run a Job on the Host
     template_id = (
         module_target_sat.api.JobTemplate()
@@ -951,7 +956,8 @@ def test_positive_installable_errata(
     result = rhel_contenthost.register(
         function_org, function_location, activation_key.name, target_sat
     )
-    assert f'The registered system name is: {rhel_contenthost.hostname}' in result.stdout
+    if rhel_contenthost.os_version.major != 6:
+        assert f'The registered system name is: {rhel_contenthost.hostname}' in result.stdout
     assert rhel_contenthost.subscribed
 
     # Remove package if already installed on this host
@@ -1073,8 +1079,10 @@ def test_positive_installed_products(
         content_view=cv, organization=org, environment=cv.environment[-1]
     ).create()
 
-    rhel_contenthost.register(org, default_location, ak.name, target_sat)
-    assert rhel_contenthost.subscribed, 'Host registration failed.'
+    if rhel_contenthost.os_version.major != 6:
+        rhel_contenthost.register(org, default_location, ak.name, target_sat)
+        if rhel_contenthost.os_version.major != 6:
+            assert rhel_contenthost.subscribed, 'Host registration failed.'
 
     input_data = {
         'organization_id': org.id,

tests/foreman/cli/test_activationkey.py

@@ -600,7 +600,8 @@ def test_positive_usage_limit(module_org, module_location, target_sat, content_h
     assert vm1.subscribed
     result = vm2.register(module_org, module_location, new_ak['name'], target_sat)
     assert not vm2.subscribed
-    assert result.status, 'Second registration was expected to fail'
+    if vm2.os_version.major != 6:
+        assert result.status, 'Second registration was expected to fail'
     assert f"Max Hosts ({max_hosts}) reached for activation key '{new_ak.name}'" in result.stderr
 
 
@@ -800,7 +801,8 @@ def test_positive_update_aks_to_chost(
             activation_keys=ak['name'],
             target=module_target_sat,
         )
-        assert rhel_contenthost.subscribed
+        if rhel_contenthost.os_version.major != 6:
+            assert rhel_contenthost.subscribed
 
 
 @pytest.mark.stubbed
@@ -1542,7 +1544,7 @@ def test_syspurpose_end_to_end(
     res = rhel_contenthost.register(module_org, None, activation_key.name, target_sat)
     if rhel_contenthost.os_version.major != 6:
         assert res.status == 0, f'Failed to register host: {res.stderr}'
-    assert rhel_contenthost.subscribed
+        assert rhel_contenthost.subscribed
     rhel_contenthost.enable_repo(module_rhst_repo)
     host = target_sat.cli.Host.info({'name': rhel_contenthost.hostname})
     # Assert system purpose values are set in the host as expected

tests/foreman/cli/test_host.py

@@ -311,7 +311,8 @@ def test_positive_host_list_with_cv_and_lce(
     """
     # register client
     result = rhel_contenthost.register(function_org, None, function_ak_with_cv.name, target_sat)
-    assert result.status == 0
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0
     assert rhel_contenthost.subscribed
     # list host command without specifying cv or lce
     host_list = target_sat.cli.Host.list(output_format='json')
@@ -1882,7 +1883,8 @@ def test_negative_multi_cv_registration(
 
     # Register with global reg, just to get the sub-man config and certs right
     result = rhel_contenthost.register(module_org, None, module_ak_with_cv.name, target_sat)
-    assert result.status == 0
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0
     assert rhel_contenthost.subscribed
 
     # Unregister the host
@@ -1954,7 +1956,8 @@ def test_positive_multi_cv_registration(
     result = rhel_contenthost.register(
         session_multicv_org, None, session_multicv_default_ak.name, session_multicv_sat
     )
-    assert result.status == 0
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0
     assert rhel_contenthost.subscribed
 
     # Unregister the host
@@ -1968,7 +1971,8 @@ def test_positive_multi_cv_registration(
     )
 
     # Confirm that registration succeeds
-    assert res.status == 0
+    if rhel_contenthost.os_version.major != 6:
+        assert res.status == 0
     assert rhel_contenthost.subscribed
 
     # Confirm that the host is registered to both environments
@@ -2028,7 +2032,8 @@ def test_positive_multi_cv_assignment(
     result = rhel_contenthost.register(
         session_multicv_org, None, session_multicv_default_ak.name, session_multicv_sat
     )
-    assert result.status == 0
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0
     assert rhel_contenthost.subscribed
 
     # Assign multiple content view environments to the host using hammer
@@ -2115,7 +2120,8 @@ def test_positive_multi_cv_host_repo_availability(
     result = rhel_contenthost.register(
         session_multicv_org, None, session_multicv_default_ak.name, session_multicv_sat
     )
-    assert result.status == 0
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0
     assert rhel_contenthost.subscribed
 
     # Assign the host to multiple content view environments with subscription-manager
@@ -2173,7 +2179,7 @@ def test_positive_dump_enc_yaml(target_sat):
 # -------------------------- HOST TRACE SUBCOMMAND SCENARIOS -------------------------
 @pytest.mark.pit_client
 @pytest.mark.client_release
-@pytest.mark.rhel_ver_list(r'^[\d]+$')
+@pytest.mark.rhel_ver_match('[^6]')
 def test_positive_tracer_list_and_resolve(tracer_host, target_sat):
     """Install tracer on client, downgrade the service, check from the satellite
     that tracer shows and resolves the problem. The test works with a package specified
@@ -2645,7 +2651,8 @@ def test_positive_reregister_rhel(
     """
     # register client
     result = rhel_contenthost.register(function_org, None, function_ak_with_cv.name, target_sat)
-    assert result.status == 0
+    if rhel_contenthost.os_version.major != 6:
+        assert result.status == 0
     assert rhel_contenthost.subscribed
     # remove local consumer certs
     rhel_contenthost.execute('rm -rf /etc/pki/consumer/*')
@@ -2655,7 +2662,8 @@ def test_positive_reregister_rhel(
     reregister = rhel_contenthost.register(
         function_org, None, function_ak_with_cv.name, target_sat, force=True
     )
-    assert reregister.status == 0
+    if rhel_contenthost.os_version.major != 6:
+        assert reregister.status == 0
     assert rhel_contenthost.subscribed
     certs = rhel_contenthost.execute("ls /etc/pki/consumer").stdout
     assert 'cert.pem' in certs

tests/foreman/cli/test_registration.py

@@ -165,7 +165,8 @@ def test_upgrade_katello_ca_consumer_rpm(module_org, module_location, target_sat
     vm.register_contenthost(module_org.label)
     result = vm.execute('subscription-manager identity')
     # Result will be 0 if registered
-    assert result.status == 0
+    if vm.os_version.major != 6:
+        assert result.status == 0
 
 
 @pytest.mark.rhel_ver_list(r'^[\d]+$')
@@ -179,7 +180,8 @@ def test_negative_register_twice(module_ak_with_cv, module_org, rhel_contenthost
     :parametrized: yes
     """
     rhel_contenthost.register(module_org, None, module_ak_with_cv.name, target_sat)
-    assert rhel_contenthost.subscribed
+    if rhel_contenthost.os_version.major != 6:
+        assert rhel_contenthost.subscribed
     result = rhel_contenthost.register(
         module_org, None, module_ak_with_cv.name, target_sat, force=False
     )
@@ -215,13 +217,12 @@ def test_positive_force_register_twice(module_ak_with_cv, module_org, rhel_conte
     )
     if rhel_contenthost.os_version.major != 6:
         assert result.status == 0
-        assert f'Unregistering from: {target_sat.hostname}' in str(result.stdout)
-        assert f'The registered system name is: {rhel_contenthost.hostname}' in str(result.stdout)
-        reg_id_new = re.search(reg_id_pattern, result.stdout).group(1)
-        assert f'The system has been registered with ID: {reg_id_new}' in str(result.stdout)
-        assert reg_id_new != reg_id_old
-    else:
-        reg_id_new = re.search(reg_id_pattern, result.stdout).group(1) if result.stdout else None
+    assert f'Unregistering from: {target_sat.hostname}' in str(result.stdout)
+    assert f'The registered system name is: {rhel_contenthost.hostname}' in str(result.stdout)
+    reg_id_new = re.search(reg_id_pattern, result.stdout).group(1)
+    assert f'The system has been registered with ID: {reg_id_new}' in str(result.stdout)
+    assert reg_id_new != reg_id_old
+    reg_id_new = re.search(reg_id_pattern, result.stdout).group(1) if result.stdout else None
     assert rhel_contenthost.subscribed
     if reg_id_new:
         assert (