Skip to content

USHIFT-3099: wait_images.py: fix restart_job so it's aware of warnings printed to stdout #3290

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Apr 26, 2024
Merged

USHIFT-3099: wait_images.py: fix restart_job so it's aware of warnings printed to stdout #3290

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ecf7f4
Fix restart_job so it's aware of warnings printed to stdout
pmtk Apr 26, 2024
8464564
Use generator instead of list comprehension
pmtk Apr 26, 2024
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
9 changes: 8 additions & 1 deletion test/bin/wait_images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,14 @@ def restart_job(cmd):
result = subprocess.run(cmd, shell=True, text=True, stdout=subprocess.PIPE)
if result.returncode != 0:
return ""
return result.stdout.split(" ")[1]
# Osbuild emits a warning on stdout about functionality we don't use in our blueprints,
# so we need to skip the lines we don't find interesting. Example output:
# > Warning: Please note that user customizations on "edge-commit" image type are deprecated and will be removed in the near future
# >
# > Compose 2c6a1ba2-4a18-49b8-a0f1-d103de1bd93a added to the queue
# Split output with \n and select line starting with "Compose", then split that line with space and select 2nd word.
line_with_id = next(line for line in result.stdout.split("\n") if line.startswith("Compose"))
return line_with_id.split(" ")[1]


def copy_build_metadata(old_id, new_id):
Expand Down