From 7a6764e6ccb17ce98398a8908c74f52248d0fa6a Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Nov 12 2017 20:28:28 +0000 Subject: Use mocked fedimg data unless real data is requested Signed-off-by: Patrick Uiterwijk --- diff --git a/alt.fedoraproject.org/build/fedimg_vars.py b/alt.fedoraproject.org/build/fedimg_vars.py index 8984848..c23f774 100755 --- a/alt.fedoraproject.org/build/fedimg_vars.py +++ b/alt.fedoraproject.org/build/fedimg_vars.py @@ -19,7 +19,7 @@ import logging import shelve import os -from fedimg_vars_lib import get_messages, sanity_check +from fedimg_vars_lib import get_messages, sanity_check, mocked_fedimg logging.basicConfig(level=logging.INFO) @@ -54,6 +54,9 @@ def collect(release): #}), ] + if not os.path.exists('/var/fedora_websites_live_fedimg'): + return mocked_fedimg(templates) + for template, buckets in templates: # 2 - Build an intermediary dict intermediary = collections.OrderedDict() diff --git a/getfedora.org/build/fedimg_vars.py b/getfedora.org/build/fedimg_vars.py index 4ba3bd3..74ddb0a 100755 --- a/getfedora.org/build/fedimg_vars.py +++ b/getfedora.org/build/fedimg_vars.py @@ -19,7 +19,7 @@ import logging import shelve import os -from fedimg_vars_lib import get_messages, sanity_check +from fedimg_vars_lib import get_messages, sanity_check, mocked_fedimg logging.basicConfig(level=logging.INFO) @@ -66,6 +66,9 @@ def collect(release): #}), ] + if not os.path.exists('/var/fedora_websites_live_fedimg'): + return mocked_fedimg(templates) + for template, buckets in templates: # 2 - Build an intermediary dict intermediary = collections.OrderedDict() diff --git a/tools/fedimg_vars_lib.py b/tools/fedimg_vars_lib.py index 4867bf5..408f10f 100755 --- a/tools/fedimg_vars_lib.py +++ b/tools/fedimg_vars_lib.py @@ -12,6 +12,7 @@ License: LGPLv2+ from __future__ import print_function import collections +import copy from datetime import datetime, timedelta import functools import logging @@ -111,3 +112,16 @@ def sanity_check(globalvar, collected_fedimg_vars): for key in collected: if not key in handtyped: log.warn("handtyped %r is missing %r" % (name, key)) + + +def mocked_fedimg(templates): + regions = ['us-east-1', 'ap-northeast-1', 'sa-east-1', 'ap-southeast-1', 'ap-southeast-2', + 'us-west-2', 'us-west-1', 'eu-central-1', 'eu-west-1'] + mockdata = {} + for region in regions: + mockdata[region] = 'ami-mocked' + toreturn = {} + for template in templates: + for restype in template[1].keys(): + toreturn[restype] = copy.copy(mockdata) + return toreturn