Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

Fix build-sync adding non-manifest lists in multiarch mode #137

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion doozerlib/VERSION
@@ -1 +1 @@
0.5.26
0.5.27
7 changes: 4 additions & 3 deletions doozerlib/cli/__main__.py
Expand Up @@ -1711,6 +1711,7 @@ def release_gen_multiarch_payload(runtime, is_name, is_namespace, organization,

# Don't try to mirror things that don't exist
try:
result = ""
cmd = "/bin/oc image info {}".format(src)
subprocess.check_output(cmd.split(' '), stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as res:
Expand All @@ -1722,10 +1723,10 @@ def release_gen_multiarch_payload(runtime, is_name, is_namespace, organization,
# results. Let's make sure that was the actual thing
# that happened.
if "error: the image is a manifest list" in result:
green_prefix("Verified source image exists and complies with naming conventions: ")
green_prefix("Verified source image is a manifest list and complies with naming conventions: ")
click.echo(src)
else:
red_prefix("NOT adding to IS, error querying image info (maybe source image does not exist?): ")
red_prefix("NOT adding to IS, error querying image info (not a manifest list or doesn't exist?): ")
click.echo(src)
missing_source_items.append(src)
continue
Expand Down Expand Up @@ -1839,7 +1840,7 @@ def release_gen_multiarch_payload(runtime, is_name, is_namespace, organization,
click.echo(" {}".format(img))
click.echo()

yellow_prefix("Images skipped due to missing source:\n")
yellow_prefix("Images skipped due to not being manifest lists or missing sources:\n")
for img in sorted(missing_source_items):
click.echo(" {}".format(img))
click.echo()
Expand Down