From f37206dbc43c486188f55930f0eae5c0d61e2fe4 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Wed, 21 Mar 2018 15:14:31 +0530 Subject: [PATCH] fedimg: Add the hotfix patch to parse Cloud and Atomic Image variant Signed-off-by: Sayan Chowdhury --- files/hotfix/fedimg/consumers.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/files/hotfix/fedimg/consumers.py b/files/hotfix/fedimg/consumers.py index cad1495d3e..3ebd4cb0c2 100644 --- a/files/hotfix/fedimg/consumers.py +++ b/files/hotfix/fedimg/consumers.py @@ -70,8 +70,19 @@ class FedimgConsumer(fedmsg.consumers.FedmsgConsumer): compose_id = msg_info['compose_id'] cmetadata = fedfind.release.get_release_cid(compose_id).metadata - images_meta = safeget(cmetadata, 'images', 'payload', 'images', - 'CloudImages', 'x86_64') + # Till F27, both cloud-base and atomic images were available + # under variant CloudImages. With F28 and onward releases, + # cloud-base image compose moved to cloud variant and atomic images + # moved under atomic variant. + prev_rel = ['26', '27'] + if msg_info['release_version'] in prev_rel: + images_meta = safeget(cmetadata, 'images', 'payload', 'images', + 'CloudImages', 'x86_64') + else: + images_meta = safeget(cmetadata, 'images', 'payload', 'images', + 'Cloud', 'x86_64') + images_meta.extend(safeget(cmetadata, 'images', 'payload', + 'images', 'AtomicHost', 'x86_64')) if images_meta is None: return