From c719e1d0c1eefc9779245025a7b77b6b43dcda90 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Tue, 22 Nov 2016 10:54:38 +0100
Subject: [PATCH] Fix the buildroot_connect calls in repos and models and set
 'system' to 'mock' when invoked from manage.py using build_module_locally

---
 manage.py                                         |  1 +
 .../scheduler/handlers/components.py              | 15 ++++++++++++++-
 module_build_service/scheduler/handlers/repos.py  | 14 +++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/manage.py b/manage.py
index 1611e2e8..34836d73 100644
--- a/manage.py
+++ b/manage.py
@@ -108,6 +108,7 @@ def cleardb():
 
 @manager.command
 def build_module_locally(url):
+    conf.set_item("system", "mock")
     username = getpass.getuser()
 
     cleardb()
diff --git a/module_build_service/scheduler/handlers/components.py b/module_build_service/scheduler/handlers/components.py
index 3b4f1948..85309116 100644
--- a/module_build_service/scheduler/handlers/components.py
+++ b/module_build_service/scheduler/handlers/components.py
@@ -79,7 +79,20 @@ def _finalize(config, session, msg, state):
         tag = parent.koji_tag
         builder = module_build_service.builder.GenericBuilder.create(
             parent.owner, module_name, config.system, config, tag_name=tag)
-        builder.buildroot_connect()
+
+        try:
+            groups = {
+                'build': parent.resolve_profiles(session, 'buildroot'),
+                'srpm-build': parent.resolve_profiles(session, 'srpm-buildroot'),
+            }
+        except ValueError:
+            reason = "Failed to gather buildroot groups from SCM."
+            log.exception(reason)
+            parent.transition(config, state="failed", state_reason=reason)
+            session.commit()
+            raise
+
+        builder.buildroot_connect(groups)
         # tag && add to srpm-build group
         nvr = "{}-{}-{}".format(msg.build_name, msg.build_version,
                                 msg.build_release)
diff --git a/module_build_service/scheduler/handlers/repos.py b/module_build_service/scheduler/handlers/repos.py
index 4ead3a7b..76eb66b6 100644
--- a/module_build_service/scheduler/handlers/repos.py
+++ b/module_build_service/scheduler/handlers/repos.py
@@ -79,10 +79,22 @@ def done(config, session, msg):
         log.warn("Odd!  All components in batch failed for %r." % module_build)
         return
 
+    try:
+        groups = {
+            'build': module_build.resolve_profiles(session, 'buildroot'),
+            'srpm-build': module_build.resolve_profiles(session, 'srpm-buildroot'),
+        }
+    except ValueError:
+        reason = "Failed to gather buildroot groups from SCM."
+        log.exception(reason)
+        module_build.transition(config, state="failed", state_reason=reason)
+        session.commit()
+        raise
+
     builder = module_build_service.builder.GenericBuilder.create(
         module_build.owner, module_build.name, config.system, config,
         tag_name=tag)
-    builder.buildroot_connect()
+    builder.buildroot_connect(groups)
 
     # Ok, for the subset of builds that did complete successfully, check to
     # see if they are in the buildroot.