[6.14.z] Debug failover to cloned manifests (#12589)

Debug failover to cloned manifests (#12515) This PR, in combination with SatelliteQE/manifester#21, addresses some of the errors that have been occurring in CI in cases where Manifester times out when exporting a manifest due to an upstream RHSM issue. These changes should enable Robottelo to successfully fail over to using cloned manifests in those cases. (cherry picked from commit b2f69d5) Co-authored-by: synkd <[email protected]>
SatelliteQE · Sep 12, 2023 · a731463 · a731463
1 parent 096744f
commit a731463
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/robottelo/host_helpers/satellite_mixins.py b/robottelo/host_helpers/satellite_mixins.py
@@ -141,13 +141,13 @@ def upload_manifest(self, org_id, manifest=None, interface='API', timeout=None):
         :returns: the manifest upload result
 
         """
-        if manifest is None:
+        if manifest.content is None:
             manifest = clone()
         if timeout is None:
             # Set the timeout to 1500 seconds to align with the API timeout.
             timeout = 1500000
         if interface == 'CLI':
-            if isinstance(manifest.content, (bytes, io.BytesIO)):
+            if hasattr(manifest, 'path'):
                 self.put(f'{manifest.path}', f'{manifest.name}')
                 result = self.cli.Subscription.upload(
                     {'file': manifest.name, 'organization-id': org_id}, timeout=timeout

diff --git a/robottelo/hosts.py b/robottelo/hosts.py
@@ -895,7 +895,7 @@ def put(self, local_path, remote_path=None):
         If local_path is a manifest object, write its contents to a temporary file
         then continue with the upload.
         """
-        if 'utils.Manifest' in str(local_path):
+        if 'utils.manifest' in str(local_path):
             with NamedTemporaryFile(dir=robottelo_tmp_dir) as content_file:
                 content_file.write(local_path.content.read())
                 content_file.flush()