testing foreman_ygg_worker, etc.

SatelliteQE · Oct 21, 2024 · d3a05c5 · d3a05c5
1 parent 295d292
commit d3a05c5
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/tests/foreman/cli/test_remoteexecution.py b/tests/foreman/cli/test_remoteexecution.py
@@ -1097,6 +1097,7 @@ def test_positive_run_job_in_chosen_directory(
 
         :parametrized: yes
         """
+
         client_repo = ohsnap.dogfood_repository(
             settings.ohsnap,
             product='client',
@@ -1112,6 +1113,7 @@ def test_positive_run_job_in_chosen_directory(
                 'location-ids': smart_proxy_location.id,
             }
         )
+
         # register host with pull provider rex
         result = rhel_contenthost.register(
             module_org,
@@ -1220,27 +1222,37 @@ def test_positive_run_job_on_host_registered_to_pull_provider(
                 'location-ids': smart_proxy_location.id,
             }
         )
+        os_version = rhel_contenthost.os_version.major
+        repos = {
+            9: f'repo=https://download.copr.fedorainfracloud.org/results/@theforeman/client-nightly-staging-scratch-a32c5a78-0443-5991-bdce-2ac40a2d4723/rhel-9-x86_64/,repo=https://download.copr.fedorainfracloud.org/results/@theforeman/client-nightly-staging-scratch-6201a5d7-2c12-5ca4-b5bb-a592db86e283/rhel-9-x86_64/,repo={client_repo.baseurl},repo={settings.repos.rhel9_os.appstream},repo={settings.repos.rhel9_os.baseos}',
+            8: f'repo=https://download.copr.fedorainfracloud.org/results/@theforeman/client-nightly-staging-scratch-a32c5a78-0443-5991-bdce-2ac40a2d4723/rhel-8-x86_64/,repo=https://download.copr.fedorainfracloud.org/results/@theforeman/client-nightly-staging-scratch-6201a5d7-2c12-5ca4-b5bb-a592db86e283/rhel-8-x86_64/,repo={client_repo.baseurl},repo={settings.repos.rhel8_os.appstream},repo={settings.repos.rhel8_os.baseos}',
+            7: f'repo=https://download.copr.fedorainfracloud.org/results/@theforeman/client-nightly-staging-scratch-a32c5a78-0443-5991-bdce-2ac40a2d4723/rhel-7-x86_64/,https://download.copr.fedorainfracloud.org/results/@theforeman/client-nightly-staging-scratch-6201a5d7-2c12-5ca4-b5bb-a592db86e283/rhel-7-x86_64/,repo={client_repo.baseurl},repo={settings.repos.rhel7_os}',
+        }
+
+        service_name = 'yggdrasild'
+        if os_version == 9:
+            service_name = 'yggdrasil'
         # register host with pull provider rex (SAT-1677)
         result = rhel_contenthost.register(
             module_org,
             smart_proxy_location,
             module_ak_with_cv.name,
             module_capsule_configured_mqtt,
             setup_remote_execution_pull=True,
-            repo_data=f'repo={client_repo.baseurl}',
+            repo_data=repos[os_version],
             ignore_subman_errors=True,
             force=True,
         )
 
         assert result.status == 0, f'Failed to register host: {result.stderr}'
         # check mqtt client is running
-        result = rhel_contenthost.execute('systemctl status yggdrasild')
+        result = rhel_contenthost.execute(f'systemctl status {service_name}')
         assert result.status == 0, f'Failed to start yggdrasil on client: {result.stderr}'
         # run script provider rex command
         invocation_command = module_target_sat.cli_factory.job_invocation(
             {
                 'job-template': 'Service Action - Script Default',
-                'inputs': 'action=status, service=yggdrasild',
+                'inputs': f'action=status, service={service_name}',
                 'search-query': f"name ~ {rhel_contenthost.hostname}",
             }
         )