Merge #362 [Waits on PR#365] Have new tags inherit from 'module-package-list' and remove the 'force' parameter when tagging a build

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"
 }

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):
         """
@@ -767,8 +767,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 = {}

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'],