From 0b38aaa1edff07ff66442b1a60c5cb8b1b30779c Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Mon, 26 Mar 2018 18:53:01 +0530 Subject: [PATCH] autocloud, hotfix: Add the patch for the hotfix (F28 messages) Signed-off-by: Sayan Chowdhury --- files/hotfix/autocloud/consumer.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/files/hotfix/autocloud/consumer.py b/files/hotfix/autocloud/consumer.py index a7b2aa5de1..0ff8317c69 100644 --- a/files/hotfix/autocloud/consumer.py +++ b/files/hotfix/autocloud/consumer.py @@ -48,7 +48,6 @@ class AutoCloudConsumer(fedmsg.consumers.FedmsgConsumer): log.info('Received %r %r' % (msg['topic'], msg['body']['msg_id'])) STATUS_F = ('FINISHED_INCOMPLETE', 'FINISHED',) - VARIANTS_F = ('CloudImages',) images = [] compose_db_update = False @@ -56,6 +55,16 @@ class AutoCloudConsumer(fedmsg.consumers.FedmsgConsumer): status = msg_body['msg']['status'] compose_images_json = None + # 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_body['msg']['release_version'] in prev_rel: + VARIANTS_F = ('CloudImages',) + else: + VARIANTS_F = ('AtomicHost', 'Cloud') + if status in STATUS_F: location = msg_body['msg']['location'] json_metadata = '{}/metadata/images.json'.format(location) @@ -133,4 +142,3 @@ class AutoCloudConsumer(fedmsg.consumers.FedmsgConsumer): image.update({'pos': (pos+1, num_images)}) produce_jobs(images) -