From c9f5c3c3a985eac7880a4ffe04c74221a86eeb0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Fri, 18 Nov 2016 01:59:33 +0100
Subject: [PATCH 01/16] Install fedpkg for CoprModuleBuilder and
 MockModuleBuilder

---
 Vagrantfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Vagrantfile b/Vagrantfile
index 49e9734e..890d9706 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -16,6 +16,7 @@ $script = <<SCRIPT
         swig \
         fedmsg-relay \
         rpm-build \
+        fedpkg \
         python-mock \
         krb5-workstation
     pip install -r /opt/module_build_service/requirements.txt

From e03272e96670d4e9e90be14165b978ad09851c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Fri, 18 Nov 2016 02:04:13 +0100
Subject: [PATCH 02/16] Convert characters not supported in copr project names

---
 module_build_service/builder.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index 73c4b966..6783f25d 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -801,7 +801,7 @@ class CoprModuleBuilder(GenericBuilder):
     def _get_copr_safe(self):
         from copr.exceptions import CoprRequestException
         # @TODO how the authentication is designed?
-        kwargs = {"ownername": "@copr", "projectname": self.tag_name}
+        kwargs = {"ownername": "@copr", "projectname": CoprModuleBuilder._tag_to_copr_name(self.tag_name)}
         try:
             return self._get_copr(**kwargs)
         except CoprRequestException:
@@ -913,6 +913,9 @@ class CoprModuleBuilder(GenericBuilder):
         the tag with particular name and architecture.
         """
         # @TODO get the correct user
+        # @TODO get the correct project
+        owner, project = "@copr", cls._tag_to_copr_name(tag_name)
+
         # Premise is that tag_name is in name-version-release format
         owner, nvr = "@copr", tag_name
         client = cls._get_client(config)
@@ -925,6 +928,11 @@ class CoprModuleBuilder(GenericBuilder):
     def cancel_build(self, task_id):
         pass
 
+    @classmethod
+    def _tag_to_copr_name(cls, koji_tag):
+        return koji_tag.replace("+", "-")
+
+
 class MockModuleBuilder(GenericBuilder):
     """
     See http://blog.samalik.com/copr-in-the-modularity-world/

From 6702b9498f554b9837686f6a6b48a601cbf7a378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Fri, 18 Nov 2016 02:05:41 +0100
Subject: [PATCH 03/16] Send module information in multiple fields

---
 module_build_service/builder.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index 6783f25d..d6e6e081 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -917,9 +917,10 @@ class CoprModuleBuilder(GenericBuilder):
         owner, project = "@copr", cls._tag_to_copr_name(tag_name)
 
         # Premise is that tag_name is in name-version-release format
-        owner, nvr = "@copr", tag_name
+        name, version, release = tag_name.rsplit("-", 2)
+
         client = cls._get_client(config)
-        response = client.get_module_repo(owner, nvr).data
+        response = client.get_module_repo(owner, project, name, version, release, arch).data
 
         if response["output"] == "notok":
             raise ValueError(response["error"])

From 638a287a298f564ad2dbba5f43287af53dfa3350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Fri, 18 Nov 2016 02:07:24 +0100
Subject: [PATCH 04/16] Add TODO that is much clearer than docstring

---
 module_build_service/builder.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index d6e6e081..ff433bad 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -825,6 +825,7 @@ class CoprModuleBuilder(GenericBuilder):
         This function is here to ensure that the buildroot (repo) is ready and
         contains the listed artifacts if specified.
         """
+        # @TODO check whether artifacts are in the buildroot (called from repos.py)
         return True
 
     def buildroot_add_artifacts(self, artifacts, install=False):

From 0e3083fc4cf4126f8b24d61ddcf3ea1ce2629ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Fri, 18 Nov 2016 02:10:31 +0100
Subject: [PATCH 05/16] Copy build_srpm and build_from_scm from
 MockModuleBuilder

---
 module_build_service/builder.py | 53 +++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index ff433bad..d9b34211 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -872,6 +872,13 @@ class CoprModuleBuilder(GenericBuilder):
         """
         log.info("Copr build")
 
+        # Git sources are treated specially.
+        if source.startswith("git://"):
+            return self.build_from_scm(artifact_name, source)
+        else:
+            return self.build_srpm(artifact_name, source)
+
+    def build_srpm(self, artifact_name, source):
         if not self.__prep:
             raise RuntimeError("Buildroot is not prep-ed")
 
@@ -897,6 +904,52 @@ class CoprModuleBuilder(GenericBuilder):
         # @TODO result should contain "module_id", "action_id" and "action_state"
         return None, None, result.message, "-".join([m1.name, m1.version, m1.release])
 
+    def build_from_scm(self, artifact_name, source):
+        """
+        Builds the artifact from the SCM based source.
+        """
+
+        # @FIXME COPR hacks
+        from module_build_service import scm
+        mock = MockModuleBuilder(self.owner, self.module_str, self.config, self.tag_name)
+        self._execute_cmd = mock._execute_cmd
+        # The rest of the method is copy-pasted from MockModuleBuilder
+
+        td = None
+        owd = os.getcwd()
+        ret = 1, koji.BUILD_STATES["FAILED"], "Cannot create SRPM", None
+
+        try:
+            log.debug('Cloning source URL: %s' % source)
+            # Create temp dir and clone the repo there.
+            td = tempfile.mkdtemp()
+            scm = module_build_service.scm.SCM(source)
+            cod = scm.checkout(td)
+
+            # Use configured command to create SRPM out of the SCM repo.
+            log.debug("Creating SRPM")
+            os.chdir(cod)
+            self._execute_cmd(self.config.mock_build_srpm_cmd.split(" "))
+
+            # Find out the built SRPM and build it normally.
+            for f in os.listdir(cod):
+                if f.endswith(".src.rpm"):
+                    log.info("Created SRPM %s" % f)
+                    source = os.path.join(cod, f)
+                    ret = self.build_srpm(artifact_name, source)
+                    break
+        finally:
+            os.chdir(owd)
+            try:
+                if td is not None:
+                    shutil.rmtree(td)
+            except Exception as e:
+                log.warning(
+                    "Failed to remove temporary directory {!r}: {}".format(
+                        td, str(e)))
+
+        return ret
+
     @staticmethod
     def get_disttag_srpm(disttag):
         # @FIXME

From f9220a44709df616bf86a2a5bbcf566d88bc3f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Fri, 18 Nov 2016 02:52:12 +0100
Subject: [PATCH 06/16] Pretend that build was successful so that rida submits
 next batch

---
 module_build_service/builder.py                    | 6 ++++--
 module_build_service/scheduler/handlers/modules.py | 5 +++++
 module_build_service/scheduler/handlers/repos.py   | 8 +++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index d9b34211..b265130d 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -902,7 +902,9 @@ class CoprModuleBuilder(GenericBuilder):
         log.info(result.data["modulemd"])
 
         # @TODO result should contain "module_id", "action_id" and "action_state"
-        return None, None, result.message, "-".join([m1.name, m1.version, m1.release])
+        # Since we don't have implemented messaging support in copr yet,
+        # let's just assume that the build is finished by now
+        return None, koji.BUILD_STATES["COMPLETE"], result.message, "-".join([m1.name, m1.version, m1.release])
 
     def build_from_scm(self, artifact_name, source):
         """
@@ -917,7 +919,7 @@ class CoprModuleBuilder(GenericBuilder):
 
         td = None
         owd = os.getcwd()
-        ret = 1, koji.BUILD_STATES["FAILED"], "Cannot create SRPM", None
+        ret = 1, koji.BUILD_STATES["COMPLETE"], "COPR BUILD DONE", None
 
         try:
             log.debug('Cloning source URL: %s' % source)
diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py
index 2c4c5cda..5fe58fc0 100644
--- a/module_build_service/scheduler/handlers/modules.py
+++ b/module_build_service/scheduler/handlers/modules.py
@@ -251,3 +251,8 @@ def wait(config, session, msg):
         # other backends need this implemented (e.g. COPR)
         return [module_build_service.messaging.KojiRepoChange(
             'fake msg', builder.module_build_tag['name'])]
+
+    # We don't have copr implementation finished yet, Let's fake the repo change event,
+    # as if copr builds finished successfully
+    if config.system == "copr":
+        return [module_build_service.messaging.KojiRepoChange('fake msg', build.koji_tag)]
diff --git a/module_build_service/scheduler/handlers/repos.py b/module_build_service/scheduler/handlers/repos.py
index 76eb66b6..191005a8 100644
--- a/module_build_service/scheduler/handlers/repos.py
+++ b/module_build_service/scheduler/handlers/repos.py
@@ -37,7 +37,7 @@ def done(config, session, msg):
 
     # First, find our ModuleBuild associated with this repo, if any.
     tag = msg.repo_tag
-    if not tag.endswith('-build'):
+    if config.system == "koji" and not tag.endswith('-build'):
         log.info("Tag %r does not end with '-build' suffix, ignoring" % tag)
         return
     tag = tag.strip('-build')
@@ -130,6 +130,12 @@ def done(config, session, msg):
 
         module_build_service.utils.start_build_batch(
             config, module_build, session, builder)
+
+        # We don't have copr implementation finished yet, Let's fake the repo change event,
+        # as if copr builds finished successfully
+        if config.system == "copr":
+            return [module_build_service.messaging.KojiRepoChange('fake msg', module_build.koji_tag)]
+
     else:
         module_build.transition(config, state=models.BUILD_STATES['done'])
         session.commit()

From 7c8349e50cfdfacf36d209472c47467f53a7b404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Wed, 23 Nov 2016 01:41:59 +0100
Subject: [PATCH 07/16] Call finalize method on builder

---
 module_build_service/builder.py                  | 13 +++++++++++++
 module_build_service/scheduler/handlers/repos.py |  1 +
 2 files changed, 14 insertions(+)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index b265130d..5ba68216 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -240,6 +240,19 @@ class GenericBuilder(six.with_metaclass(ABCMeta)):
         """
         raise NotImplementedError()
 
+    def finalize(self):
+        """
+        :return: None
+
+        This method is supposed to be called after all module builds are
+        successfully finished.
+
+        It could be utilized for various purposes such as cleaning or
+        running additional build-system based operations on top of
+        finished builds (e.g. for copr - composing them into module)
+        """
+        pass
+
     @classmethod
     @abstractmethod
     def repo_from_tag(self, config, tag_name, arch):
diff --git a/module_build_service/scheduler/handlers/repos.py b/module_build_service/scheduler/handlers/repos.py
index 191005a8..ce776b1a 100644
--- a/module_build_service/scheduler/handlers/repos.py
+++ b/module_build_service/scheduler/handlers/repos.py
@@ -139,3 +139,4 @@ def done(config, session, msg):
     else:
         module_build.transition(config, state=models.BUILD_STATES['done'])
         session.commit()
+        builder.finalize()

From 0134f3a32dc53589b4c7de7646c0318b21ef7ade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Wed, 23 Nov 2016 01:44:43 +0100
Subject: [PATCH 08/16] Move module composing in copr to finalize method

---
 module_build_service/builder.py | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index 5ba68216..f04c48ce 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -900,24 +900,9 @@ class CoprModuleBuilder(GenericBuilder):
         if response.output != "ok":
             log.error(response.error)
 
-        # Create a module from previous project
-        modulemd = tempfile.mktemp()
-        m1 = ModuleBuild.query.filter(ModuleBuild.name == self.module_str).first()
-        m1.mmd().dump(modulemd)
-
-        kwargs = {"username": self.copr.username, "projectname": self.copr.projectname, "modulemd": modulemd}
-        result = self.client.create_new_build_module(**kwargs)
-        if result.output != "ok":
-            log.error(result.error)
-            return
-
-        log.info(result.message)
-        log.info(result.data["modulemd"])
-
-        # @TODO result should contain "module_id", "action_id" and "action_state"
         # Since we don't have implemented messaging support in copr yet,
         # let's just assume that the build is finished by now
-        return None, koji.BUILD_STATES["COMPLETE"], result.message, "-".join([m1.name, m1.version, m1.release])
+        return response.data["ids"][0], koji.BUILD_STATES["COMPLETE"], response.message, None
 
     def build_from_scm(self, artifact_name, source):
         """
@@ -965,6 +950,21 @@ class CoprModuleBuilder(GenericBuilder):
 
         return ret
 
+    def finalize(self):
+        # Create a module from previous project
+        modulemd = tempfile.mktemp()
+        m1 = ModuleBuild.query.filter(ModuleBuild.name == self.module_str).first()
+        m1.mmd().dump(modulemd)
+
+        kwargs = {"username": self.copr.username, "projectname": self.copr.projectname, "modulemd": modulemd}
+        result = self.client.create_new_build_module(**kwargs)
+        if result.output != "ok":
+            log.error(result.error)
+            return
+
+        log.info(result.message)
+        log.info(result.data["modulemd"])
+
     @staticmethod
     def get_disttag_srpm(disttag):
         # @FIXME

From 83a71e04436c8104e9aafc1c0c00d4ec59e91fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Wed, 23 Nov 2016 03:09:25 +0100
Subject: [PATCH 09/16] Wait some time until builds are finished

---
 module_build_service/builder.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index f04c48ce..2522912e 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -951,6 +951,13 @@ class CoprModuleBuilder(GenericBuilder):
         return ret
 
     def finalize(self):
+        # @FIXME
+        # Sleep some amount of time to wait until builds are finished
+        # We are just workarounding missing fedmsg support from copr
+        seconds = 180
+        log.info("Going to sleep for {}s to wait until builds in copr are finished".format(seconds))
+        time.sleep(seconds)
+
         # Create a module from previous project
         modulemd = tempfile.mktemp()
         m1 = ModuleBuild.query.filter(ModuleBuild.name == self.module_str).first()

From 94c1b80cb24ebd72e9c85633e0311245cda8243e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Wed, 23 Nov 2016 04:22:10 +0100
Subject: [PATCH 10/16] Workaround missing module_build_tag in copr

---
 module_build_service/builder.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index 2522912e..53f7757e 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -977,6 +977,11 @@ class CoprModuleBuilder(GenericBuilder):
         # @FIXME
         return KojiModuleBuilder.get_disttag_srpm(disttag)
 
+    @property
+    def module_build_tag(self):
+        # Workaround koji specific code in modules.py
+        return {"name": self.tag_name}
+
     @classmethod
     def repo_from_tag(cls, config, tag_name, arch):
         """

From 84b7b08f256ae3a85e3b2c372bbc806e813ecdab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Wed, 23 Nov 2016 04:49:43 +0100
Subject: [PATCH 11/16] Upgrade copr builder to support modulemd 1.0.2

---
 module_build_service/builder.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index 53f7757e..0c9c95d4 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -997,11 +997,11 @@ class CoprModuleBuilder(GenericBuilder):
         # @TODO get the correct project
         owner, project = "@copr", cls._tag_to_copr_name(tag_name)
 
-        # Premise is that tag_name is in name-version-release format
-        name, version, release = tag_name.rsplit("-", 2)
+        # Premise is that tag_name is in name-stream-version format
+        name, stream, version = tag_name.rsplit("-", 2)
 
         client = cls._get_client(config)
-        response = client.get_module_repo(owner, project, name, version, release, arch).data
+        response = client.get_module_repo(owner, project, name, stream, version, arch).data
 
         if response["output"] == "notok":
             raise ValueError(response["error"])

From 99d2dfbc87d3e98491c6ca7aac8f328c7036c166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Thu, 24 Nov 2016 22:51:14 +0100
Subject: [PATCH 12/16] There really should be 'failed'

---
 module_build_service/builder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index 0c9c95d4..475bfcd1 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -917,7 +917,7 @@ class CoprModuleBuilder(GenericBuilder):
 
         td = None
         owd = os.getcwd()
-        ret = 1, koji.BUILD_STATES["COMPLETE"], "COPR BUILD DONE", None
+        ret = (0, koji.BUILD_STATES["FAILED"], "Cannot create SRPM", None)
 
         try:
             log.debug('Cloning source URL: %s' % source)

From fffefb5f482fe22e177de4bcb46954772e0eed01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Thu, 1 Dec 2016 00:32:11 +0100
Subject: [PATCH 13/16] Fallback to koji when module is not in copr

---
 conf/config.py                  |  2 +-
 module_build_service/builder.py | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/conf/config.py b/conf/config.py
index e34adcbd..905d0013 100644
--- a/conf/config.py
+++ b/conf/config.py
@@ -28,6 +28,7 @@ class BaseConfiguration(object):
     KOJI_PROFILE = 'koji'
     KOJI_ARCHES = ['i686', 'armv7hl', 'x86_64']
     KOJI_PROXYUSER = True
+    KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos'
     COPR_CONFIG = '/etc/module_build_service/copr.conf'
     PDC_URL = 'http://modularity.fedorainfracloud.org:8080/rest_api/v1'
     PDC_INSECURE = True
@@ -128,7 +129,6 @@ class TestConfiguration(BaseConfiguration):
 
     KOJI_CONFIG = './conf/koji.conf'
     KOJI_PROFILE = 'staging'
-    KOJI_REPOSITORY_URL = 'https://kojipkgs.stg.fedoraproject.org/repos'
 
 
 class ProdConfiguration(BaseConfiguration):
diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index 475bfcd1..f26bd895 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -861,10 +861,17 @@ class CoprModuleBuilder(GenericBuilder):
     def buildroot_add_repos(self, dependencies):
         log.info("%r adding deps on %r" % (self, dependencies))
         # @TODO get architecture from some builder variable
-        # @TODO use the proper backend for each dependency
-        repos = [GenericBuilder.tag_to_repo("copr", self.config, d, "x86_64") for d in dependencies]
+        repos = [self._dependency_repo(d, "x86_64") for d in dependencies]
         self.client.modify_project(self.copr.projectname, username=self.copr.username, repos=repos)
 
+    def _dependency_repo(self, module, arch, backend="copr"):
+        try:
+            repo = GenericBuilder.tag_to_repo(backend, self.config, module, arch)
+            return repo
+        except ValueError:
+            if backend == "copr":
+                return self._dependency_repo(module, arch, "koji")
+
     def build(self, artifact_name, source):
         """
         :param artifact_name : A package name. We can't guess it since macros
@@ -1000,12 +1007,14 @@ class CoprModuleBuilder(GenericBuilder):
         # Premise is that tag_name is in name-stream-version format
         name, stream, version = tag_name.rsplit("-", 2)
 
-        client = cls._get_client(config)
-        response = client.get_module_repo(owner, project, name, stream, version, arch).data
+        from copr.exceptions import CoprRequestException
+        try:
+            client = cls._get_client(config)
+            response = client.get_module_repo(owner, project, name, stream, version, arch).data
+            return response["repo"]
 
-        if response["output"] == "notok":
-            raise ValueError(response["error"])
-        return response["repo"]
+        except CoprRequestException as e:
+            raise ValueError(e)
 
     def cancel_build(self, task_id):
         pass

From c68a1908bd610bef5ee110ae3f30617d6117f3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Thu, 1 Dec 2016 01:27:00 +0100
Subject: [PATCH 14/16] Wait in loop until all builds are finished

---
 module_build_service/builder.py | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index f26bd895..5a1c02b8 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -957,19 +957,28 @@ class CoprModuleBuilder(GenericBuilder):
 
         return ret
 
-    def finalize(self):
-        # @FIXME
-        # Sleep some amount of time to wait until builds are finished
-        # We are just workarounding missing fedmsg support from copr
-        seconds = 180
-        log.info("Going to sleep for {}s to wait until builds in copr are finished".format(seconds))
-        time.sleep(seconds)
+    def _wait_until_all_builds_are_finished(self, module):
+        seconds = 60
+        unfinished = [b.task_id for b in module.component_builds]
+        while unfinished:
+            unfinished = filter(lambda x: self.client.get_build_details(x).status != "succeeded", unfinished)
+            log.info("Going to sleep for {}s to wait until builds in copr are finished".format(seconds))
+            time.sleep(seconds)
 
-        # Create a module from previous project
+    def finalize(self):
         modulemd = tempfile.mktemp()
         m1 = ModuleBuild.query.filter(ModuleBuild.name == self.module_str).first()
         m1.mmd().dump(modulemd)
 
+        # Wait until all builds are finished
+        # We shouldn't do this once the fedmsg on copr is done
+        from copr.exceptions import CoprRequestException
+        try:
+            self._wait_until_all_builds_are_finished(m1)
+        except CoprRequestException:
+            return log.info("Missing builds, not going to create a module")
+
+        # Create a module from previous project
         kwargs = {"username": self.copr.username, "projectname": self.copr.projectname, "modulemd": modulemd}
         result = self.client.create_new_build_module(**kwargs)
         if result.output != "ok":

From 74ab8ab8ccc0d05f844b59371b76948d1b7ab0d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Thu, 1 Dec 2016 02:03:01 +0100
Subject: [PATCH 15/16] Refactor duplicit build_from_scm method

---
 module_build_service/builder.py | 151 ++++++++++++--------------------
 1 file changed, 54 insertions(+), 97 deletions(-)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index 5a1c02b8..8155878c 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -52,6 +52,7 @@ from OpenSSL.SSL import SysCallError
 
 from module_build_service import conf, log, db
 from module_build_service.models import ModuleBuild
+import module_build_service.scm
 import module_build_service.scheduler.main
 import module_build_service.utils
 
@@ -894,7 +895,7 @@ class CoprModuleBuilder(GenericBuilder):
 
         # Git sources are treated specially.
         if source.startswith("git://"):
-            return self.build_from_scm(artifact_name, source)
+            return build_from_scm(artifact_name, source, self.config, self.build_srpm)
         else:
             return self.build_srpm(artifact_name, source)
 
@@ -911,52 +912,6 @@ class CoprModuleBuilder(GenericBuilder):
         # let's just assume that the build is finished by now
         return response.data["ids"][0], koji.BUILD_STATES["COMPLETE"], response.message, None
 
-    def build_from_scm(self, artifact_name, source):
-        """
-        Builds the artifact from the SCM based source.
-        """
-
-        # @FIXME COPR hacks
-        from module_build_service import scm
-        mock = MockModuleBuilder(self.owner, self.module_str, self.config, self.tag_name)
-        self._execute_cmd = mock._execute_cmd
-        # The rest of the method is copy-pasted from MockModuleBuilder
-
-        td = None
-        owd = os.getcwd()
-        ret = (0, koji.BUILD_STATES["FAILED"], "Cannot create SRPM", None)
-
-        try:
-            log.debug('Cloning source URL: %s' % source)
-            # Create temp dir and clone the repo there.
-            td = tempfile.mkdtemp()
-            scm = module_build_service.scm.SCM(source)
-            cod = scm.checkout(td)
-
-            # Use configured command to create SRPM out of the SCM repo.
-            log.debug("Creating SRPM")
-            os.chdir(cod)
-            self._execute_cmd(self.config.mock_build_srpm_cmd.split(" "))
-
-            # Find out the built SRPM and build it normally.
-            for f in os.listdir(cod):
-                if f.endswith(".src.rpm"):
-                    log.info("Created SRPM %s" % f)
-                    source = os.path.join(cod, f)
-                    ret = self.build_srpm(artifact_name, source)
-                    break
-        finally:
-            os.chdir(owd)
-            try:
-                if td is not None:
-                    shutil.rmtree(td)
-            except Exception as e:
-                log.warning(
-                    "Failed to remove temporary directory {!r}: {}".format(
-                        td, str(e)))
-
-        return ret
-
     def _wait_until_all_builds_are_finished(self, module):
         seconds = 60
         unfinished = [b.task_id for b in module.component_builds]
@@ -1223,13 +1178,6 @@ $repos
         )
         module_build_service.scheduler.main.outgoing_work_queue_put(msg)
 
-    def _execute_cmd(self, args):
-        log.debug("Executing command: %s" % args)
-        ret = subprocess.call(args)
-        if ret != 0:
-            raise RuntimeError("Command '%s' returned non-zero value %d"
-                               % (args, ret))
-
     def _save_log(self, log_name, artifact_name):
         old_log = os.path.join(self.resultsdir, log_name)
         new_log = os.path.join(self.resultsdir, artifact_name + "-" + log_name)
@@ -1242,12 +1190,12 @@ $repos
         """
         try:
             # Initialize mock.
-            self._execute_cmd(["mock", "-r", self.mock_config, "--init"])
+            _execute_cmd(["mock", "-r", self.config.mock_config, "--init"])
 
             # Start the build and store results to resultsdir
             # TODO: Maybe this should not block in the future, but for local
             # builds it is not a big problem.
-            self._execute_cmd(["mock", "-r", self.mock_config,
+            _execute_cmd(["mock", "-r", self.config.mock_config,
                                "--no-clean", "--rebuild", source,
                                "--resultdir=%s" % self.resultsdir])
 
@@ -1288,46 +1236,6 @@ $repos
         reason = "Submitted %s to Koji" % (artifact_name)
         return MockModuleBuilder._build_id, state, reason, None
 
-    def build_from_scm(self, artifact_name, source):
-        """
-        Builds the artifact from the SCM based source.
-        """
-        td = None
-        owd = os.getcwd()
-        ret = (MockModuleBuilder._build_id, koji.BUILD_STATES["FAILED"],
-               "Cannot create SRPM", None)
-
-        try:
-            log.debug('Cloning source URL: %s' % source)
-            # Create temp dir and clone the repo there.
-            td = tempfile.mkdtemp()
-            scm = module_build_service.scm.SCM(source)
-            cod = scm.checkout(td)
-
-            # Use configured command to create SRPM out of the SCM repo.
-            log.debug("Creating SRPM")
-            os.chdir(cod)
-            self._execute_cmd(self.config.mock_build_srpm_cmd.split(" "))
-
-            # Find out the built SRPM and build it normally.
-            for f in os.listdir(cod):
-                if f.endswith(".src.rpm"):
-                    log.info("Created SRPM %s" % f)
-                    source = os.path.join(cod, f)
-                    ret = self.build_srpm(artifact_name, source)
-                    break
-        finally:
-            os.chdir(owd)
-            try:
-                if td is not None:
-                    shutil.rmtree(td)
-            except Exception as e:
-                log.warning(
-                    "Failed to remove temporary directory {!r}: {}".format(
-                        td, str(e)))
-
-        return ret
-
     def build(self, artifact_name, source):
         log.info("Starting building artifact %s: %s" % (artifact_name, source))
 
@@ -1335,7 +1243,7 @@ $repos
 
         # Git sources are treated specially.
         if source.startswith("git://"):
-            return self.build_from_scm(artifact_name, source)
+            return build_from_scm(artifact_name, source, self.config, self.build_srpm)
         else:
             return self.build_srpm(artifact_name, source)
 
@@ -1348,6 +1256,55 @@ $repos
     def cancel_build(self, task_id):
         pass
 
+
+def build_from_scm(artifact_name, source, config, build_srpm):
+    """
+    Builds the artifact from the SCM based source.
+    """
+    td = None
+    owd = os.getcwd()
+    ret = (0, koji.BUILD_STATES["FAILED"], "Cannot create SRPM", None)
+
+    try:
+        log.debug('Cloning source URL: %s' % source)
+        # Create temp dir and clone the repo there.
+        td = tempfile.mkdtemp()
+        scm = module_build_service.scm.SCM(source)
+        cod = scm.checkout(td)
+
+        # Use configured command to create SRPM out of the SCM repo.
+        log.debug("Creating SRPM")
+        os.chdir(cod)
+        _execute_cmd(config.mock_build_srpm_cmd.split(" "))
+
+        # Find out the built SRPM and build it normally.
+        for f in os.listdir(cod):
+            if f.endswith(".src.rpm"):
+                log.info("Created SRPM %s" % f)
+                source = os.path.join(cod, f)
+                ret = build_srpm(artifact_name, source)
+                break
+    finally:
+        os.chdir(owd)
+        try:
+            if td is not None:
+                shutil.rmtree(td)
+        except Exception as e:
+            log.warning(
+                "Failed to remove temporary directory {!r}: {}".format(
+                    td, str(e)))
+
+    return ret
+
+
+def _execute_cmd(args):
+    log.debug("Executing command: %s" % args)
+    ret = subprocess.call(args)
+    if ret != 0:
+        raise RuntimeError("Command '%s' returned non-zero value %d"
+                           % (args, ret))
+
+
 GenericBuilder.register_backend_class(KojiModuleBuilder)
 GenericBuilder.register_backend_class(CoprModuleBuilder)
 GenericBuilder.register_backend_class(MockModuleBuilder)

From bdec1bb85fd4c15ab63bdc439b55ae9ec9761f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Kadl=C4=8D=C3=ADk?= <frostyx@email.cz>
Date: Thu, 1 Dec 2016 02:54:53 +0100
Subject: [PATCH 16/16] Dont create module if any build failed

---
 module_build_service/builder.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index 8155878c..ed431a5f 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -913,10 +913,15 @@ class CoprModuleBuilder(GenericBuilder):
         return response.data["ids"][0], koji.BUILD_STATES["COMPLETE"], response.message, None
 
     def _wait_until_all_builds_are_finished(self, module):
-        seconds = 60
-        unfinished = [b.task_id for b in module.component_builds]
-        while unfinished:
-            unfinished = filter(lambda x: self.client.get_build_details(x).status != "succeeded", unfinished)
+        while True:
+            states = {b: self.client.get_build_details(b.task_id).status for b in module.component_builds}
+            if "failed" in states.values():
+                raise ValueError("Some builds failed")
+
+            if not filter(lambda x: x != "succeeded", states.values()):
+                return
+
+            seconds = 60
             log.info("Going to sleep for {}s to wait until builds in copr are finished".format(seconds))
             time.sleep(seconds)
 
@@ -930,7 +935,7 @@ class CoprModuleBuilder(GenericBuilder):
         from copr.exceptions import CoprRequestException
         try:
             self._wait_until_all_builds_are_finished(m1)
-        except CoprRequestException:
+        except (CoprRequestException, ValueError):
             return log.info("Missing builds, not going to create a module")
 
         # Create a module from previous project