modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-02-11 00:55:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update CoprBuildEnd message to reflect actual data

Browse Source
This commit is contained in:
Jakub Kadlčík
2017-04-10 20:28:53 +02:00
parent 14ee3a4591
commit 7c81a72138
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module_build_service/messaging.py
View File

@@ -27,7 +27,6 @@
import json
import os
import re
import kobo.rpmlib
try:
from inspect import signature
except ImportError:
@@ -225,8 +224,9 @@ class BaseMessage(object):
build = msg_inner_msg.get('build')
status = msg_inner_msg.get('status')
pkg = msg_inner_msg.get('pkg')
version = msg_inner_msg.get('version')
what = msg_inner_msg.get('what')
msg_obj = CoprBuildEnd(msg_id, build, status, copr, pkg, what)
msg_obj = CoprBuildEnd(msg_id, build, status, copr, pkg, version, what)
# If the message matched the regex and is important to the app,
# it will be returned
@@ -305,16 +305,16 @@ class CoprBuildEnd(KojiBuildChange):
(e.g. mutt-kz-1.5.23.1-1.20150203.git.c8504a8a.fc21)
:param state_reason: the optional reason as to why the state changed
"""
def __init__(self, msg_id, build_id, status, copr, pkg, what=None):
nvr = kobo.rpmlib.parse_nvra(pkg)
def __init__(self, msg_id, build_id, status, copr, pkg, version, what=None):
ver, rel = version.split("-", 1)
super(CoprBuildEnd, self).__init__(
msg_id=msg_id,
build_id=build_id,
task_id=build_id,
build_new_state=status,
build_name=nvr["name"],
build_version=nvr["version"],
build_release=".".join(s for s in [nvr["release"], nvr["epoch"], nvr["arch"]] if s),
build_name=pkg,
build_version=ver,
build_release=rel,
state_reason=what,
)
self.copr = copr

2
tests/test_messaging.py
View File

@@ -65,7 +65,7 @@ class TestFedmsgMessaging(unittest.TestCase):
'copr': 'mutt-kz',
'ip': '172.16.3.3',
'pid': 12010,
'pkg': 'mutt-kz-1.5.23.1-1.20150203.git.c8504a8a.fc21',
'pkg': 'mutt-kz', # Reality doesnt match the linked docs
'status': 1,
'user': 'fatka',
'version': '1.5.23.1-1.20150203.git.c8504a8a.fc21',