being more selective on the koji tags we trigger on. Fixes T862
ClosedPublic
Actions

Authored by tflink on Oct 31 2016, 7:51 PM.

Details

Reviewers

mkrizek
jskladan

Maniphest Tasks

T862: Fix koji tag triggering to match change in releng tag usage

Commits

rTRGR7f900322ed74: being more selective on the koji tags we trigger on. Fixes T862

Summary

there are now '*-signing-pending' tags in koji which we shouldn't be triggering on. make the logic more picky on what gets through and what doesn't so that we're not triggering on invalid tags. Fixes T862

Test Plan

run locally, make sure that jobs on '*-signing-pending' tags are no longer triggered

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.

tflink retitled this revision from to being more selective on the koji tags we trigger on. Fixes T862.Oct 31 2016, 7:51 PM

tflink updated this object.

tflink edited the test plan for this revision. (Show Details)

tflink added reviewers: mkrizek, jskladan.

tflink added a task: T862: Fix koji tag triggering to match change in releng tag usage.

tflink added a subscriber: kparal.

As I am not on my work laptop I can't test but the code looks good to me.

One note is that I thought that all these "ifs" went to trigger_rules.yml with the "rewrite", but @jskladan would know.

Given that this would fix all these crashes we're getting today and the infra freeze is upon us, LGTM.

I'd say let's update stg/prod with the trigger 0.4.x so it can be fixed there as well. I haven't seen any crashes on dev.

This revision is now accepted and ready to land.Oct 31 2016, 8:46 PM

Yeah, I'm not sure that we need so much filtering in the python code now that regexp is supported in the rules yaml. I pretty much echo what you're saying, though - freeze is in ~ 4 hours and this needs to be fixed (even if that fix needs to be changed) before then

Closed by commit rTRGR7f900322ed74: being more selective on the koji tags we trigger on. Fixes T862 (authored by tflink). · Explain WhyOct 31 2016, 9:20 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

			Path	Packages
M			jobtriggers/koji_tag_msg.py (5 lines)
M			testing/test_koji_tag_trigger.py (16 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	2662	5b41975		Oct 31 2016, 7:51 PM	★	★
Diff 2	2663	5b41975	rTRGR7f900322ed746e21c23a5907586181c2001e43d5	Oct 31 2016, 8:50 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
a883389cce7f	3345891212d3	5b41975e172f	Tim Flink	being more selective on the koji tags we trigger on. Fixes T862 (Show More…)	Oct 31 2016, 6:52 PM

Diff 2663

View Options

jobtriggers/koji_tag_msg.py

Show All 14 Lines
15	def get_item(msg):	15	def get_item(msg):
16	koji_tag = msg['msg']['tag']	16	koji_tag = msg['msg']['tag']
17	instance = msg['msg']['instance']	17	instance = msg['msg']['instance']
18		18
19	if not instance == 'primary':	19	if not instance == 'primary':
20	raise exc.TriggerMsgError('rejecting message not from primary koji instance (%s from %s)'	20	raise exc.TriggerMsgError('rejecting message not from primary koji instance (%s from %s)'
21	% (koji_tag, instance))	21	% (koji_tag, instance))
22		22
23	if not koji_tag.endswith('pending'):	23	if not re.match('.*-updates(-testing)?-pending', koji_tag):
24	raise exc.TriggerMsgError('rejecting message for not being a pending tag (%s)' % koji_tag)	24	raise exc.TriggerMsgError('rejecting message for not being an updates-(testing?)-pending',
		25	'tag (%s)' % koji_tag)
25		26
26	m = re.match(r'^f\d\d-.*', koji_tag)	27	m = re.match(r'^f\d\d-.*', koji_tag)
27	if m is None:	28	if m is None:
28	raise exc.TriggerMsgError('rejecting message for not starting with fedora version '	29	raise exc.TriggerMsgError('rejecting message for not starting with fedora version '
29	'(e.g. f22) (%s)' % koji_tag)	30	'(e.g. f22) (%s)' % koji_tag)
30		31
31	return koji_tag	32	return koji_tag
32		33
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines