From 6ff2c19b60cef6a5a91605e56c908c5a5f06a54d Mon Sep 17 00:00:00 2001
From: Matt Prahl <mprahl@redhat.com>
Date: Tue, 28 Feb 2017 12:38:48 -0500
Subject: [PATCH 1/2] Have new tags inherit from 'module-package-list' and
 remove the 'force' parameter when tagging a build

---
 module_build_service/builder.py | 9 +++++----
 module_build_service/config.py  | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/module_build_service/builder.py b/module_build_service/builder.py
index 8e992384..557a3694 100644
--- a/module_build_service/builder.py
+++ b/module_build_service/builder.py
@@ -534,7 +534,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
 
         for nvr in artifacts:
             log.info("%r tagging %r into %r" % (self, nvr, build_tag))
-            self.koji_session.tagBuild(build_tag, nvr, force=True)
+            self.koji_session.tagBuild(build_tag, nvr)
 
             if not install:
                 continue
@@ -549,7 +549,7 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
 
         for nvr in artifacts:
             log.info("%r tagging %r into %r" % (self, nvr, dest_tag))
-            self.koji_session.tagBuild(dest_tag, nvr, force=True)
+            self.koji_session.tagBuild(dest_tag, nvr)
 
     def wait_task(self, task_id):
         """
@@ -768,8 +768,9 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules
         log.debug("Ensuring existence of tag='%s'." % tag_name)
         taginfo = self.koji_session.getTag(tag_name)
 
-        if not taginfo: # Existing tag, need to check whether settings is correct
-            self.koji_session.createTag(tag_name, {})
+        if not taginfo:
+            self.koji_session.createTag(
+                tag_name, parent=conf.koji_tag_inherit_from)
             taginfo = self._get_tag(tag_name)
 
         opts = {}
diff --git a/module_build_service/config.py b/module_build_service/config.py
index 90c37318..031c25cb 100644
--- a/module_build_service/config.py
+++ b/module_build_service/config.py
@@ -163,6 +163,10 @@ class Config(object):
             'type': str,
             'default': '',
             'desc': 'Target to build "module-build-macros" RPM in.'},
+        'koji_tag_inherit_from': {
+            'type': str,
+            'default': 'module-package-list',
+            'desc': 'Tag that new module tags inherit from.'},
         'koji_tag_prefixes': {
             'type': list,
             'default': ['module'],

From b254ba40ccc6be2f3a3f4164673c3b24beb0530f Mon Sep 17 00:00:00 2001
From: Matt Prahl <mprahl@redhat.com>
Date: Tue, 28 Feb 2017 17:39:30 -0500
Subject: [PATCH 2/2] Use the latest testmodule version

---
 contrib/submit-build.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/submit-build.json b/contrib/submit-build.json
index 477849fa..c5a42739 100644
--- a/contrib/submit-build.json
+++ b/contrib/submit-build.json
@@ -1,3 +1,3 @@
 {
-    "scmurl": "git://pkgs.stg.fedoraproject.org/modules/testmodule.git?#4cef8cb"
+    "scmurl": "git://pkgs.stg.fedoraproject.org/modules/testmodule.git?#789dc7b"
 }