Differential D789

koji_build: Return tuple (n, v, r) instead of str nvr
ClosedPublic
Actions

Authored by mkrizek on Mar 22 2016, 3:18 PM.

Details

Reviewers
garretraziel
tflink
Commits
rTRGR9e2a8d440f13: koji_build: Return tuple (n, v, r) instead of str nvr
Summary

It is now easier to trigger e.g. package specific tasks without parsing
nvr. This is needed for both T744 and T749.

Test Plan

Run fedmsg-hub and watch if jobs are triggered. Worked in my testing.

Diff Detail

Repository
rTRGR taskotron-trigger
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mkrizek retitled this revision from to koji_build: Return tuple (n, v, r) instead of str nvr.Mar 22 2016, 3:18 PM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added reviewers: tflink, garretraziel.
tflink accepted this revision.Mar 22 2016, 10:43 PM
This revision is now accepted and ready to land.Mar 22 2016, 10:43 PM
garretraziel accepted this revision.Mar 23 2016, 10:22 AM
Closed by commit rTRGR9e2a8d440f13: koji_build: Return tuple (n, v, r) instead of str nvr (authored by mkrizek). · Explain WhyMar 23 2016, 1:15 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 2025

View Options

jobtriggers/jobrunner.py

Show First 20 Lines • Show All 52 Lines • ▼ Show 20 Line(s)46def datagrepper_jobs(start, end):
53 } 53​ }
54 54​
55 r = requests.get(config.datagrepper_url, params=params) 55​ r = requests.get(config.datagrepper_url, params=params)
56 56​
57 koji_tag_items = set() 57​ koji_tag_items = set()
58 for msg in r.json()['raw_messages']: 58​ for msg in r.json()['raw_messages']:
59 if msg['topic'].endswith('build.state.change'): 59​ if msg['topic'].endswith('build.state.change'):
60 try: 60​ try:
61 item = koji_build_msg.get_item(msg) 61​ n, v, r = koji_build_msg.get_nvr(msg)
62 item_type = koji_build_msg.ITEM_TYPE 62​ item_type = koji_build_msg.ITEM_TYPE
63 tasks = config.koji_build_completed_tasks 63​ tasks = config.koji_build_completed_tasks
64 trigger_tasks(item, item_type, tasks, config.valid_arches) 64​ trigger_tasks('-'.join((n, v, r)), item_type, tasks, config.valid_arches)
65 except TriggerMsgError, e: 65​ except TriggerMsgError, e:
66 logger.debug(e) 66​ logger.debug(e)
67 elif msg['topic'].endswith('tag'): 67​ elif msg['topic'].endswith('tag'):
68 try: 68​ try:
69 koji_tag_items.add(koji_tag_msg.get_item(msg)) 69​ koji_tag_items.add(koji_tag_msg.get_item(msg))
70 except TriggerMsgError, e: 70​ except TriggerMsgError, e:
71 logger.debug(e) 71​ logger.debug(e)
72 else: 72​ else:
Show All 27 Lines
View Options

jobtriggers/koji_build_msg.py

1import koji 1​import koji
2import fedmsg 2​import fedmsg
3import fedmsg.encoding 3​import fedmsg.encoding
4 4​
5from . import config, JobTrigger, TriggerMsgError 5​from . import config, JobTrigger, TriggerMsgError
6 6​
7ITEM_TYPE = 'koji_build' 7​ITEM_TYPE = 'koji_build'
8 8​
9 9​
10def get_item(msg): 10​def get_nvr(msg):
11 release = msg['msg']['release'] 11​ release = msg['msg']['release']
12 state = msg['msg']['new'] 12​ state = msg['msg']['new']
13 instance = msg['msg']['instance'] 13​ instance = msg['msg']['instance']
14 14​
15 name = msg['msg']['name'] 15​ name = msg['msg']['name']
16 version = msg['msg']['version'] 16​ version = msg['msg']['version']
17 17​
18 envr = "%s-%s-%s" % (name, version, release) 18​ nvr = '-'.join((name, version, release))
19 19​
20 if not instance == 'primary': 20​ if not instance == 'primary':
21 raise TriggerMsgError('rejecting message not from primary koji instance (%s from %s)' % (envr, instance)) 21​ raise TriggerMsgError('rejecting message not from primary koji instance (%s from %s)' %
22​ (nvr, instance))
22 23​
23 if state != koji.BUILD_STATES['COMPLETE']: 24​ if state != koji.BUILD_STATES['COMPLETE']:
24 raise TriggerMsgError('rejecting message for not being a build complete message (%s, status %s)' % (envr, state)) 25​ raise TriggerMsgError('rejecting message for not being a build complete message '
26​ '(%s, status %s)' % (nvr, state))
25 27​
26 if 'fc' not in release: 28​ if 'fc' not in release:
27 raise TriggerMsgError('rejecting message for not containing "fc" in release (%s)' % envr) 29​ raise TriggerMsgError('rejecting message for not containing "fc" in release (%s)' % nvr)
28 30​
29 return envr 31​ return name, version, release
30 32​
31 33​
32class KojiBuildCompletedJobTrigger(JobTrigger): 34​class KojiBuildCompletedJobTrigger(JobTrigger):
33 topic = "org.fedoraproject.prod.buildsys.build.state.change" 35​ topic = "org.fedoraproject.prod.buildsys.build.state.change"
34 jsonify = False 36​ jsonify = False
35 config_key = 'taskotron.kojibuildcompletedjobtrigger.enabled' 37​ config_key = 'taskotron.kojibuildcompletedjobtrigger.enabled'
36 38​
37 def __init__(self, *args, **kw): 39​ def __init__(self, *args, **kw):
38 super(KojiBuildCompletedJobTrigger, self).__init__(*args, **kw) 40​ super(KojiBuildCompletedJobTrigger, self).__init__(*args, **kw)
39 41​
40 def consume(self, message): 42​ def consume(self, message):
41 msg = fedmsg.encoding.loads(message.body) 43​ msg = fedmsg.encoding.loads(message.body)
42 44​
43 try: 45​ try:
44 item = get_item(msg) 46​ name, version, release = get_nvr(msg)
45 self.trigger_tasks(item, ITEM_TYPE, config.koji_build_completed_tasks, config.valid_arches) 47​ self.trigger_tasks('-'.join((name, version, release)),
48​ ITEM_TYPE,
49​ config.koji_build_completed_tasks,
50​ config.valid_arches)
46 except TriggerMsgError, e: 51​ except TriggerMsgError, e:
47 self.log.debug(e) 52​ self.log.debug(e)
View Options

jobtriggers/koji_tag_msg.py

1import re 1​import re
2from copy import deepcopy 2​from copy import deepcopy
3 3​
4import fedmsg 4​import fedmsg
5import fedmsg.encoding 5​import fedmsg.encoding
6import moksha.hub.reactor ​
7 6​
8from twisted.internet.task import LoopingCall 7​from twisted.internet.task import LoopingCall
9 8​
10from . import config, JobTrigger, TriggerMsgError 9​from . import config, JobTrigger, TriggerMsgError
11 10​
12ITEM_TYPE = 'koji_tag' 11​ITEM_TYPE = 'koji_tag'
13 12​
14 13​
15def get_item(msg): 14​def get_item(msg):
16 koji_tag = msg['msg']['tag'] 15​ koji_tag = msg['msg']['tag']
17 instance = msg['msg']['instance'] 16​ instance = msg['msg']['instance']
18 17​
19 if not instance == 'primary': 18​ if not instance == 'primary':
20 raise TriggerMsgError('rejecting message not from primary koji instance (%s from %s)' % (koji_tag, instance)) 19​ raise TriggerMsgError('rejecting message not from primary koji instance (%s from %s)'
20​ % (koji_tag, instance))
21 21​
22 if not koji_tag.endswith('pending'): 22​ if not koji_tag.endswith('pending'):
23 raise TriggerMsgError('rejecting message for not being a pending tag (%s)' % koji_tag) 23​ raise TriggerMsgError('rejecting message for not being a pending tag (%s)' % koji_tag)
24 24​
25 m = re.match(r'^f\d\d-.*', koji_tag) 25​ m = re.match(r'^f\d\d-.*', koji_tag)
26 if m is None: 26​ if m is None:
27 raise TriggerMsgError('rejecting message for not starting with fedora version (e.g. f22) (%s)' % koji_tag) 27​ raise TriggerMsgError('rejecting message for not starting with fedora version (e.g. f22) '
28​ '(%s)' % koji_tag)
28 29​
29 return koji_tag 30​ return koji_tag
30 31​
31 32​
32class KojiTagChangedJobTrigger(JobTrigger): 33​class KojiTagChangedJobTrigger(JobTrigger):
33 topic = "org.fedoraproject.prod.buildsys.tag" 34​ topic = "org.fedoraproject.prod.buildsys.tag"
34 jsonify = False 35​ jsonify = False
35 config_key = 'taskotron.kojitagchangedjobtrigger.enabled' 36​ config_key = 'taskotron.kojitagchangedjobtrigger.enabled'
Show All 38 Lines