#990 Allow overriding the name and stream from scm repos.
Merged 11 months ago by mprahl. Opened 11 months ago by ralph.

@@ -197,6 +197,16 @@ 

              'default': True,

              'desc': 'Enable or disable imports to koji using content '

                      'generator api'},

+         'allow_name_override_from_scm': {

+             'type': bool,

+             'default': False,

+             'desc': 'Allow modulemd files to override the module name '

+             'if different from the scm repo name.'},

+         'allow_stream_override_from_scm': {

+             'type': bool,

+             'default': False,

+             'desc': 'Allow modulemd files to override the module stream '

+             'if different from the scm repo branch.'},

          'allow_custom_scmurls': {

              'type': bool,

              'default': False,

@@ -418,17 +418,19 @@ 

      # If the name was set in the modulemd, make sure it matches what the scmurl

      # says it should be

      if mmd.get_name() and mmd.get_name() != scm.name:

-         raise ValidationError('The name "{0}" that is stored in the modulemd '

-                               'is not valid'.format(mmd.get_name()))

+         if not conf.allow_name_override_from_scm:

+             raise ValidationError('The name "{0}" that is stored in the modulemd '

+                                   'is not valid'.format(mmd.get_name()))

      else:

          mmd.set_name(scm.name)

  

      # If the stream was set in the modulemd, make sure it matches what the repo

      # branch is

      if mmd.get_stream() and mmd.get_stream() != scm.branch:

-         raise ValidationError('The stream "{0}" that is stored in the modulemd '

-                               'does not match the branch "{1}"'.format(

-                                   mmd.get_stream(), scm.branch))

+         if not conf.allow_stream_override_from_scm:

+             raise ValidationError('The stream "{0}" that is stored in the modulemd '

+                                   'does not match the branch "{1}"'.format(

+                                       mmd.get_stream(), scm.branch))

      else:

          mmd.set_stream(str(scm.branch))

  

If configured on the server side, disabled by default.

/cc @dgregor, @tmlcoch, @psabata who were talking about it earlier today.

:thumbsup: I would have liked having tests, but since this is a priority let's merge as is.

Commit 09edb4c fixes this pull-request

Pull-Request has been merged by mprahl

11 months ago

Pull-Request has been merged by mprahl

11 months ago

That was quick.

Do you think it would make sense to allow overriding version and context, and basically anything that MBS generates, to get us closer to the original goal where we wanted to be able to re-submit fully expanded modulemds to reproduce the build? I know we're far from that at this point.