From 042b677a01ab88f30330ae4fec9cb33ef8cb57f2 Mon Sep 17 00:00:00 2001
From: mprahl <mprahl@redhat.com>
Date: Aug 07 2018 14:33:14 +0000
Subject: [PATCH 1/3] Raise an exception if the build is not returned from Koji when checking if the buildroot is ready


---

diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py
index 4ffcff3..acaa14b 100644
--- a/module_build_service/builder/KojiModuleBuilder.py
+++ b/module_build_service/builder/KojiModuleBuilder.py
@@ -199,7 +199,7 @@ class KojiModuleBuilder(GenericBuilder):
 
         tag_id = self.module_target['build_tag']
         repo = self.koji_session.getRepo(tag_id)
-        builds = [self.koji_session.getBuild(a) for a in artifacts or []]
+        builds = [self.koji_session.getBuild(a, strict=True) for a in artifacts or []]
         log.info("%r checking buildroot readiness for "
                  "repo: %r, tag_id: %r, artifacts: %r, builds: %r" % (
                      self, repo, tag_id, artifacts, builds))

From 3969b2fb1e94c3ce15b1229810be5a40a80f91b4 Mon Sep 17 00:00:00 2001
From: mprahl <mprahl@redhat.com>
Date: Aug 07 2018 14:33:56 +0000
Subject: [PATCH 2/3] Expose the component batch in the API to help in future debugging


---

diff --git a/module_build_service/models.py b/module_build_service/models.py
index a6342b8..aa3d7fd 100644
--- a/module_build_service/models.py
+++ b/module_build_service/models.py
@@ -747,6 +747,7 @@ class ComponentBuild(MBSBase):
         if show_state_url:
             state_url = get_url_for('component_build', api_version=api_version, id=self.id)
         json.update({
+            'batch': self.batch,
             'state_trace': [{'time': _utc_datetime_to_iso(record.state_time),
                              'state': record.state,
                              'state_name': INVERSE_BUILD_STATES[record.state],

From 411e4590081b3282a5a46b0527449dfdb382b84d Mon Sep 17 00:00:00 2001
From: mprahl <mprahl@redhat.com>
Date: Aug 07 2018 14:34:09 +0000
Subject: [PATCH 3/3] Use the actual name from the NVR instead of component.package when reusing components


The name from the NVR and the name from the component may be different based on
the macros being used as part of the build. SCLs are a great example of this.

---

diff --git a/module_build_service/utils/reuse.py b/module_build_service/utils/reuse.py
index 826cad9..395aa6c 100644
--- a/module_build_service/utils/reuse.py
+++ b/module_build_service/utils/reuse.py
@@ -67,7 +67,7 @@ def reuse_component(component, previous_component_build,
             build_id=None,
             task_id=component.task_id,
             build_new_state=previous_component_build.state,
-            build_name=component.package,
+            build_name=nvr_dict['name'],
             build_version=nvr_dict['version'],
             build_release=nvr_dict['release'],
             module_build_id=component.module_id,