From d6d0c870fcc7faa549b4400295c2b0ec36e4d07f Mon Sep 17 00:00:00 2001 From: mprahl Date: Apr 04 2019 17:16:33 +0000 Subject: Disable Greenwave gating by default --- diff --git a/conf/config.py b/conf/config.py index 1246032..2ecb776 100644 --- a/conf/config.py +++ b/conf/config.py @@ -124,6 +124,7 @@ class TestConfiguration(BaseConfiguration): RESOLVER = 'db' ALLOWED_GROUPS_TO_IMPORT_MODULE = set(['mbs-import-module']) + GREENWAVE_DECISION_CONTEXT = 'osci_compose_gate_modules' class ProdConfiguration(BaseConfiguration): diff --git a/module_build_service/config.py b/module_build_service/config.py index 07b4ead..fb91850 100644 --- a/module_build_service/config.py +++ b/module_build_service/config.py @@ -537,10 +537,8 @@ class Config(object): }, 'greenwave_decision_context': { 'type': str, - 'default': 'osci_compose_gate_modules', - 'desc': 'The Greenwave decision context that whose messages should ' - 'be handled by MBS. By default, MBS handles Greenwave ' - 'messages for OSCI.', + 'default': '', + 'desc': 'The Greenwave decision context that determines a module\'s gating status.', }, 'allowed_disttag_marking_module_names': { 'type': list, diff --git a/module_build_service/scheduler/handlers/greenwave.py b/module_build_service/scheduler/handlers/greenwave.py index 186b56d..e406d78 100644 --- a/module_build_service/scheduler/handlers/greenwave.py +++ b/module_build_service/scheduler/handlers/greenwave.py @@ -63,6 +63,11 @@ def decision_update(config, session, msg): ``greenwave.decision.update``. :type msg: :class:`GreenwaveDecisionUpdate` """ + if not config.greenwave_decision_context: + log.debug('Skip Greenwave message %s as MBS does not have GREENWAVE_DECISION_CONTEXT ' + 'configured', msg.msg_id) + return + if msg.decision_context != config.greenwave_decision_context: log.debug('Skip Greenwave message %s as MBS only handles message in ' 'decision context %s',