From 92102a2ac024ab7a104ad090beeff682de7e9dd6 Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Mon, 24 Jul 2017 23:07:59 +0200 Subject: [PATCH] Don't build from scm locally --- module_build_service/builder/CoprModuleBuilder.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/module_build_service/builder/CoprModuleBuilder.py b/module_build_service/builder/CoprModuleBuilder.py index ccbdce7b..b43f62e7 100644 --- a/module_build_service/builder/CoprModuleBuilder.py +++ b/module_build_service/builder/CoprModuleBuilder.py @@ -241,7 +241,7 @@ class CoprModuleBuilder(GenericBuilder): with CoprModuleBuilder._build_lock: # Git sources are treated specially. if source.startswith(("git://", "http://", "https://")): - return build_from_scm(artifact_name, source, self.config, self.build_srpm) + return self.build_scm(source) else: return self.build_srpm(artifact_name, source) @@ -257,13 +257,14 @@ class CoprModuleBuilder(GenericBuilder): return response.data["ids"][0], koji.BUILD_STATES["BUILDING"], response.message, None def build_scm(self, source): - # @TODO use this method once support on Copr side is finished - # Copr is currently able to create a build from fedora distgit, - # but not from custom distgit, such as copr-dist-git url, branch = source.split("?#") url = (url.replace("git://", "https://") .replace("pkgs.fedoraproject.org", "src.fedoraproject.org/git")) - self.client.create_new_build_distgit(self.copr.projectname, url, branch=branch, username=self.copr.username) + response = self.client.create_new_build_distgit(self.copr.projectname, url, branch=branch, username=self.copr.username) + if response.output != "ok": + log.error(response.error) + + return response.data["ids"][0], koji.BUILD_STATES["BUILDING"], response.message, None def finalize(self): modulemd = tempfile.mktemp()