[6.15.z] Add some randomness to CV publish break down

tests/foreman/destructive/test_contentview.py

@@ -11,6 +11,9 @@
 :CaseImportance: High
 
 """
+import random
+from time import sleep
+
 from nailgun.entity_mixins import TaskFailedError
 import pytest
 
@@ -19,73 +22,81 @@
 pytestmark = pytest.mark.destructive
 
 
+@pytest.fixture(scope='module')
+def module_big_repos(module_target_sat, module_sca_manifest_org):
+    """Enables and syncs three bigger RH repos"""
+    repos = []
+    for tag in ['rhel7_optional', 'rhel7_extra', 'rhel7_sup']:
+        id = module_target_sat.api_factory.enable_rhrepo_and_fetchid(
+            basearch=constants.DEFAULT_ARCHITECTURE,
+            org_id=module_sca_manifest_org.id,
+            product=constants.REPOS[tag]['product'],
+            repo=constants.REPOS[tag]['name'],
+            reposet=constants.REPOS[tag]['reposet'],
+            releasever=constants.REPOS[tag]['releasever'],
+        )
+        repo = module_target_sat.api.Repository(id=id).read()
+        repos.append(repo)
+        repo.sync(synchronous=False)
+    module_target_sat.wait_for_tasks(
+        search_query=(
+            f'label = Actions::Katello::Repository::Sync and organization_id = {module_sca_manifest_org.id}'
+        ),
+        poll_timeout=750,
+        search_rate=10,
+        max_tries=75,
+    )
+    return repos
+
+
 @pytest.mark.tier4
 @pytest.mark.run_in_one_thread
-def test_positive_reboot_recover_cv_publish(target_sat, function_entitlement_manifest_org):
+@pytest.mark.parametrize('reboot', [True, False], ids=['vm_reboot', 'fm_restart'])
+def test_positive_reboot_recover_cv_publish(
+    module_target_sat, module_sca_manifest_org, module_big_repos, reboot
+):
     """Reboot the Satellite during publish and resume publishing
 
     :id: cceae727-81db-40a4-9c26-05ca6e93464e
 
-    :steps:
-        1. Create and publish a Content View
-        2. Reboot the Satellite while publish is running
-        3. Check Foreman Tasks
+    :parametrized: yes
 
-    :expectedresults: Publish continues after reboot and finishes successfully
+    :setup:
+        1. Enable and sync 3 bigger RH repos.
 
-    :CaseImportance: High
+    :steps:
+        1. Create and publish a Content View with the setup repos.
+        2. Reboot or restart the Satellite while publish is running.
+        3. Check Foreman Tasks.
 
-    :CaseAutomation: Automated
+    :expectedresults: Publish continues after reboot/restart and finishes successfully.
     """
-    org = function_entitlement_manifest_org
-    rhel7_extra = target_sat.api_factory.enable_rhrepo_and_fetchid(
-        basearch='x86_64',
-        org_id=org.id,
-        product=constants.PRDS['rhel'],
-        repo=constants.REPOS['rhel7_extra']['name'],
-        reposet=constants.REPOSET['rhel7_extra'],
-        releasever=None,
-    )
-    rhel7_optional = target_sat.api_factory.enable_rhrepo_and_fetchid(
-        basearch='x86_64',
-        org_id=org.id,
-        product=constants.PRDS['rhel'],
-        repo=constants.REPOS['rhel7_optional']['name'],
-        reposet=constants.REPOSET['rhel7_optional'],
-        releasever=constants.REPOS['rhel7_optional']['releasever'],
-    )
-    rhel7_sup = target_sat.api_factory.enable_rhrepo_and_fetchid(
-        basearch='x86_64',
-        org_id=org.id,
-        product=constants.PRDS['rhel'],
-        repo=constants.REPOS['rhel7_sup']['name'],
-        reposet=constants.REPOSET['rhel7_sup'],
-        releasever=constants.REPOS['rhel7_sup']['releasever'],
-    )
-    rhel7_extra = target_sat.api.Repository(id=rhel7_extra).read()
-    rhel7_optional = target_sat.api.Repository(id=rhel7_optional).read()
-    rhel7_sup = target_sat.api.Repository(id=rhel7_sup).read()
-    for repo in [rhel7_extra, rhel7_optional, rhel7_sup]:
-        repo.sync(timeout=1200)
-    cv = target_sat.api.ContentView(
-        organization=org,
+    cv = module_target_sat.api.ContentView(
+        organization=module_sca_manifest_org,
         solve_dependencies=True,
-        repository=[rhel7_extra, rhel7_sup, rhel7_optional],
+        repository=module_big_repos,
     ).create()
     try:
         publish_task = cv.publish(synchronous=False)
-        target_sat.power_control(state='reboot', ensure=True)
-        target_sat.wait_for_tasks(
+        sleep_time = random.randint(0, 60)  # publish takes ~70s in 6.15 and SatLab VM
+        sleep(sleep_time)
+        if reboot:
+            module_target_sat.power_control(state='reboot', ensure=True)
+        else:
+            module_target_sat.cli.Service.restart()
+        module_target_sat.wait_for_tasks(
             search_query=(f'id = {publish_task["id"]}'),
             search_rate=30,
             max_tries=60,
         )
     except TaskFailedError:
-        target_sat.api.ForemanTask().bulk_resume(data={"task_ids": [publish_task['id']]})
-        target_sat.wait_for_tasks(
+        module_target_sat.api.ForemanTask().bulk_resume(data={"task_ids": [publish_task['id']]})
+        module_target_sat.wait_for_tasks(
             search_query=(f'id = {publish_task["id"]}'),
             search_rate=30,
             max_tries=60,
         )
-    task_status = target_sat.api.ForemanTask(id=publish_task['id']).poll()
-    assert task_status['result'] == 'success'
+    task_status = module_target_sat.api.ForemanTask(id=publish_task['id']).poll()
+    assert (
+        task_status['result'] == 'success'
+    ), f'Publish after restart failed, sleep_time was {sleep_time}'