From a78929e6828e3986610fc51c03bc8afaaaa7fb4c Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Mon, 8 Mar 2021 11:53:25 -0800 Subject: [PATCH] prune-quay.py: parse and hold possible arch value currently only for debugging ease; may be useful in future Signed-off-by: Dan Mick --- quay-pruner/build/prune-quay.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/quay-pruner/build/prune-quay.py b/quay-pruner/build/prune-quay.py index 58ddc718..518bd740 100755 --- a/quay-pruner/build/prune-quay.py +++ b/quay-pruner/build/prune-quay.py @@ -58,11 +58,12 @@ def parse_quay_tag(tag): mo = NAME_RE.match(tag) if mo is None: - return None, None, None + return None, None, None, None ref = mo.group(1) short_sha1 = mo.group(2) el = mo.group(3) - return ref, short_sha1, el + arch = mo.group(4) + return ref, short_sha1, el, arch def query_shaman(ref, sha1, el): @@ -102,9 +103,8 @@ def query_shaman(ref, sha1, el): return response -def ref_present_in_shaman(tag, verbose): +def ref_present_in_shaman(ref, short_sha1, el, arch, verbose): - ref, short_sha1, el = parse_quay_tag(tag['name']) if ref is None: return False @@ -129,8 +129,7 @@ def ref_present_in_shaman(tag, verbose): for match in matches: if match['sha1'][0:7] == short_sha1: if verbose: - print('Found %s in shaman: sha1 %s quayname %s' % - (ref, match['sha1'], tag['name'])) + print('Found %s in shaman: sha1 %s' % (ref, match['sha1'])) short_sha1_cache.add(short_sha1) return True return False @@ -222,17 +221,17 @@ def main(): print('Skipping deleted-or-overwritten tag %s' % name) continue - ref, short_sha1, el = parse_quay_tag(name) + ref, short_sha1, el, arch = parse_quay_tag(name) if ref is None: ''' if args.verbose: print( - 'Skipping %s, not in ref-shortsha1-el form' % name + 'Skipping %s, not in ref-shortsha1-el-arch form' % name ) ''' continue - if ref_present_in_shaman(tag, args.verbose): + if ref_present_in_shaman(ref, short_sha1, el, arch, args.verbose): if args.verbose: print('Skipping %s, present in shaman' % name) continue -- 2.39.5