Move send_repo_done to utils

module_build_service/builder/CoprModuleBuilder.py

@@ -39,7 +39,7 @@ import module_build_service.scheduler
 import module_build_service.scheduler.consumer
 
 from base import GenericBuilder
-from utils import build_from_scm
+from utils import build_from_scm, fake_repo_done_message
 from KojiModuleBuilder import KojiModuleBuilder
 
 logging.basicConfig(level=logging.DEBUG)
@@ -162,14 +162,7 @@ class CoprModuleBuilder(GenericBuilder):
         # Start of a new batch of builds is triggered by buildsys.repo.done message.
         # However in Copr there is no such thing. Therefore we are going to fake
         # the message when builds are finished
-        self._send_repo_done()
-
-    def _send_repo_done(self):
-        msg = module_build_service.messaging.KojiRepoChange(
-            msg_id='a faked internal message',
-            repo_tag=self.tag_name + "-build",
-        )
-        module_build_service.scheduler.consumer.work_queue_put(msg)
+        fake_repo_done_message(self.tag_name)
 
     def buildroot_add_repos(self, dependencies):
         log.info("%r adding deps on %r" % (self, dependencies))

module_build_service/builder/MockModuleBuilder.py

@@ -37,7 +37,7 @@ import module_build_service.scheduler
 import module_build_service.scheduler.consumer
 
 from base import GenericBuilder
-from utils import execute_cmd, build_from_scm
+from utils import execute_cmd, build_from_scm, fake_repo_done_message
 from KojiModuleBuilder import KojiModuleBuilder
 
 logging.basicConfig(level=logging.DEBUG)
@@ -252,14 +252,7 @@ mdpolicy=group:primary
                 self.groups.append("module-build-macros")
                 self._write_mock_config()
 
-        self._send_repo_done()
-
-    def _send_repo_done(self):
-        msg = module_build_service.messaging.KojiRepoChange(
-            msg_id='a faked internal message',
-            repo_tag=self.tag_name + "-build",
-        )
-        module_build_service.scheduler.consumer.work_queue_put(msg)
+        fake_repo_done_message(self.tag_name)
 
     def tag_artifacts(self, artifacts):
         pass

module_build_service/builder/utils.py

@@ -5,7 +5,8 @@ import shutil
 import subprocess
 import logging
 import module_build_service
-from module_build_service import log, scm
+import module_build_service.scheduler
+from module_build_service import log, scm, messaging
 
 
 logging.basicConfig(level=logging.DEBUG)
@@ -90,3 +91,11 @@ def execute_cmd(args, stdout = None, stderr = None, cwd = None):
     if proc.returncode != 0:
         err_msg = "Command '%s' returned non-zero value %d%s" % (args, proc.returncode, out_log_msg)
         raise RuntimeError(err_msg)
+
+
+def fake_repo_done_message(tag_name):
+    msg = module_build_service.messaging.KojiRepoChange(
+        msg_id='a faked internal message',
+        repo_tag=tag_name + "-build",
+    )
+    module_build_service.scheduler.consumer.work_queue_put(msg)