From bc37046851f32f6d796fe368b3140d41fcd09ceb Mon Sep 17 00:00:00 2001 From: Chris MacNaughton Date: Fri, 12 Oct 2018 09:05:26 +0200 Subject: [PATCH] raise exception when trying to mix series --- zaza/utilities/bundle.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/zaza/utilities/bundle.py b/zaza/utilities/bundle.py index 3e4e843..2db5301 100644 --- a/zaza/utilities/bundle.py +++ b/zaza/utilities/bundle.py @@ -29,12 +29,15 @@ def remove_machine_specification(input_yaml): :rtype: dict """ machines = input_yaml.pop("machines", None) - if not input_yaml.get('series'): - if machines: - for (name, details) in machines.items(): - if details['series']: - input_yaml['series'] = details['series'] - break + + input_series = input_yaml.get('series', None) + if machines: + for (name, details) in machines.items(): + if details['series']: + if input_series and details['series'] != input_series: + raise Exception("Mixing series is not supported") + input_yaml['series'] = details['series'] + input_series = input_yaml['series'] for (application_name, application) in input_yaml['services'].items(): application.pop("to", None)