From ddbeb0aca7320d07199ff1054c24f8ab8757d562 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Jun 14 2018 09:37:52 +0000
Subject: Get buildrequired modules for koji tag inheritance using NSVC, not just NSV.


---

diff --git a/module_build_service/resolver/DBResolver.py b/module_build_service/resolver/DBResolver.py
index f6c2b02..c2d0f6a 100644
--- a/module_build_service/resolver/DBResolver.py
+++ b/module_build_service/resolver/DBResolver.py
@@ -156,9 +156,12 @@ class DBResolver(GenericResolver):
 
             buildrequires = xmd_mbs['buildrequires']
             for br_name, details in buildrequires.items():
-                build = session.query(models.ModuleBuild).filter_by(
-                    name=br_name, stream=details['stream'], version=details['version'],
-                    state=models.BUILD_STATES['ready']).first()
+                build = models.ModuleBuild.get_build_from_nsvc(
+                    session, br_name, details['stream'], details['version'], details['context'],
+                    state=models.BUILD_STATES['ready'])
+                if not build:
+                    raise RuntimeError(
+                        'Buildrequired module %s %r does not exist in MBS db' % (br_name, details))
                 module_tags[build.koji_tag] = build.mmd()
 
         return module_tags
diff --git a/tests/staged_data/local_builds/module-child-master-20170816080815/results/modules.yaml b/tests/staged_data/local_builds/module-child-master-20170816080815/results/modules.yaml
index 6cd8a16..fe98641 100644
--- a/tests/staged_data/local_builds/module-child-master-20170816080815/results/modules.yaml
+++ b/tests/staged_data/local_builds/module-child-master-20170816080815/results/modules.yaml
@@ -29,7 +29,7 @@ data:
     mbs:
       buildrequires:
         parent: {ref: 147dca4ca65aa9a1ac51f71b7e687f9178ffa5df, stream: master,
-          version: '20170816080815'}
+          version: '20170816080815', context: '123'}
       commit: 722fd739fd6cf66faf29f6fb95dd64f60ba3e39a
       rpms:
         ed: {ref: 01bf8330812fea798671925cc537f2f29b0bd216}
diff --git a/tests/staged_data/local_builds/module-parent-master-20170816080815/results/modules.yaml b/tests/staged_data/local_builds/module-parent-master-20170816080815/results/modules.yaml
index fea4ca3..2d19b26 100644
--- a/tests/staged_data/local_builds/module-parent-master-20170816080815/results/modules.yaml
+++ b/tests/staged_data/local_builds/module-parent-master-20170816080815/results/modules.yaml
@@ -21,11 +21,12 @@ data:
   stream: master
   summary: A test module in all its beautiful beauty
   version: 20170816080815
+  context: 123
   xmd:
     mbs:
       buildrequires:
         testmodule: {ref: 147dca4ca65aa9a1ac51f71b7e687f9178ffa5df, stream: master,
-          version: '20170616125652'}
+          version: '20170616125652', context: '321'}
       requires:
         platform: {ref: virtual, stream: f28, version: '3'}
       commit: 722fd739fd6cf66faf29f6fb95dd64f60ba3e39a
diff --git a/tests/staged_data/local_builds/module-testmodule-master-20170816080815/results/modules.yaml b/tests/staged_data/local_builds/module-testmodule-master-20170816080815/results/modules.yaml
index c45de19..efe96fc 100644
--- a/tests/staged_data/local_builds/module-testmodule-master-20170816080815/results/modules.yaml
+++ b/tests/staged_data/local_builds/module-testmodule-master-20170816080815/results/modules.yaml
@@ -21,6 +21,7 @@ data:
   stream: master
   summary: A test module in all its beautiful beauty
   version: 20170816080815
+  context: 321
   xmd:
     mbs:
       buildrequires:
diff --git a/tests/staged_data/local_builds/module-testmodule-master-20170816080816/results/modules.yaml b/tests/staged_data/local_builds/module-testmodule-master-20170816080816/results/modules.yaml
index 7ab7302..81923a4 100644
--- a/tests/staged_data/local_builds/module-testmodule-master-20170816080816/results/modules.yaml
+++ b/tests/staged_data/local_builds/module-testmodule-master-20170816080816/results/modules.yaml
@@ -21,6 +21,7 @@ data:
   stream: master
   summary: A test module in all its beautiful beauty
   version: 20170816080816
+  context: 321
   xmd:
     mbs:
       buildrequires: