#48 Use ArtifactType instead of string in record_build
Merged 8 years ago by qwan. Opened 8 years ago by qwan.

@@ -91,19 +91,19 @@ 

                                             namespace='container',

                                             scratch=conf.koji_container_scratch_build)

  

-     def record_build(self, event, name, type, build_id, dep_of=None):

+     def record_build(self, event, name, artifact_type, build_id, dep_of=None):

          """

          Record build in db.

  

          :param event: instance of an event.

          :param name: name of the artifact.

-         :param type: type of the artifact, can be 'rpm', 'image' or module.

+         :param artifact_type: an enum member of ArtifactType.

          :param build_id: id of the build in build system.

          :param def_of: the artifact which this one depends on.

          """

          ev = models.Event.get_or_create(db.session, event.msg_id,

                                          event.search_key, event.__class__)

-         models.ArtifactBuild.create(db.session, ev, name, type, build_id, dep_of)

+         models.ArtifactBuild.create(db.session, ev, name, artifact_type.name.lower(), build_id, dep_of)

          db.session.commit()

  

      def allow_build(self, artifact_type, name, branch):

@@ -62,7 +62,7 @@ 

  

                  task_id = self.build_container(name, branch, rev)

                  if task_id is not None:

-                     self.record_build(event, container['name'], 'image', task_id)

+                     self.record_build(event, container['name'], ArtifactType.IMAGE, task_id)

              except:

                  log.exception('Error when rebuild %s', container)

  

@@ -48,7 +48,7 @@ 

              task_id = self.build_container(event.container, event.branch, event.rev)

  

              if task_id is not None:

-                 self.record_build(event, event.container, 'image', task_id)

+                 self.record_build(event, event.container, ArtifactType.IMAGE, task_id)

  

          except koji.krbV.Krb5Error as e:

              log.exception('Failed to login Koji via Kerberos using GSSAPI. %s', e.args[1])

@@ -47,6 +47,6 @@ 

  

          build_id = self.build_module(event.module, event.branch, event.rev)

          if build_id is not None:

-             self.record_build(event, event.module, 'module', build_id)

+             self.record_build(event, event.module, ArtifactType.MODULE, build_id)

  

          return []

@@ -63,6 +63,6 @@ 

              rev = utils.bump_distgit_repo('modules', name, branch=version, commit_msg=commit_msg, logger=log)

              build_id = self.build_module(name, version, rev)

              if build_id is not None:

-                 self.record_build(event, name, 'module', build_id)

+                 self.record_build(event, name, ArtifactType.MODULE, build_id)

  

          return []

@@ -98,6 +98,6 @@ 

                  rev = utils.bump_distgit_repo('modules', name, branch=version, commit_msg=commit_msg, logger=log)

                  new_build_id = self.build_module(name, version, rev)

                  if new_build_id is not None:

-                     self.record_build(event, name, 'module', new_build_id, dep_of=module_build)

+                     self.record_build(event, name, ArtifactType.MODULE, new_build_id, dep_of=module_build)

  

          return []