Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.14.z] Fix regression from cloned manifest failover #12617

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix regression from cloned manifest failover (#12605)
This PR adds a check to resolve a regression in `upload_manifest`
introduced by #12515.

(cherry picked from commit 8d516af)
  • Loading branch information
synkd authored and web-flow committed Sep 14, 2023
commit 479b3690559ac6e42757b83abfd938d0bc0f687e
5 changes: 3 additions & 2 deletions robottelo/host_helpers/satellite_mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,9 @@ def upload_manifest(self, org_id, manifest=None, interface='API', timeout=None):
:returns: the manifest upload result

"""
if manifest.content is None:
manifest = clone()
if not isinstance(manifest, (bytes, io.BytesIO)):
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
Expand Down