#362 [Waits on PR#365] Have new tags inherit from 'module-package-list' and remove the 'force' parameter when tagging a build
Merged 7 years ago by ralph. Opened 7 years ago by mprahl.

file modified
+1 -1
@@ -1,3 +1,3 @@ 

  {

-     "scmurl": "git://pkgs.stg.fedoraproject.org/modules/testmodule.git?#4cef8cb"

+     "scmurl": "git://pkgs.stg.fedoraproject.org/modules/testmodule.git?#789dc7b"

  }

@@ -534,7 +534,7 @@ 

  

          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 @@ 

  

          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 @@ 

          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 = {}

@@ -163,6 +163,10 @@ 

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

This addresses #333 but needs PR#365 merged before builds work.

@mprahl - the tag is being prepared now.

~❯ koji --profile staging list-pkgs --tag module-package-list | wc -l
5013

It should be done in a few minutes.

Your change here looks good to me. :+1:

rebased

7 years ago

OK. #365 is merged.

Commit da0d5f5 fixes this pull-request

Pull-Request has been merged by rbean@redhat.com

7 years ago

Pull-Request has been merged by ralph

7 years ago