jobtriggers/triggers.py
49	(I thought I left this comment earlier, but I must not have hit submit...) This line lead to some confusion. Say a user puts `type = Wat` in the config file. Taskotron will load and start without an error message, and the user will actually get a `StreamTrigger`. (More realistically, imagine that the user has put `type = BuildBotTrigger`. That's a typo where they actually meant `BuildbotTrigger`). Perhaps this should raise a KeyError if the exact trigger name is not found. Something like return _triggers[trigger_type]()

jobtriggers/triggers.py
49	`TaskotronConfigError` might be suitable for this.

jobtriggers/triggers.py
49	Yeah, but do we want to pull libtaskotron as dependency just so we can use TaskotronConfigError? I don't know how much code of libtaskotron will be needed in the trigger in future though. @tflink? @ralph, your point makes sense to me.

jobtriggers/triggers.py
49	Good point. Does taskotron-trigger make sense without having libtaskotron installed? Won't it call `runtask` eventually?

		Path
M		conf/settings.cfg.example (1 line)
M		jobtriggers/bodhi_msg.py (2 lines)
M		jobtriggers/config.py (2 lines)
M		jobtriggers/koji_msg.py (2 lines)
M		jobtriggers/triggers.py (6 lines)
A	M	testing/test_triggers.py (17 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	111	6ed8c2d		Apr 3 2014, 1:56 PM	★	★
Diff 2	117	6835b51	Add simple tests	Apr 4 2014, 11:27 AM	★	★
Diff 3	118	0b0eee7	Base it on the correct branch this time?	Apr 4 2014, 11:28 AM	★	★
Diff 4	119	0b0eee7	Name the test class properly	Apr 4 2014, 11:31 AM	★	★
Diff 5	120	0b0eee7	Raise KeyError when trigger does not exist	Apr 7 2014, 9:05 AM	★	★
Diff 6	126	8b29118	Commit rTRGR7f83c79a41ad9cf6b1374666f4c3b952b0728615	Apr 8 2014, 2:53 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
1c3218136145	049922948e71	0b0eee73af54	Martin Krizek	Add support for choosing trigger based on config value (Show More…)	Apr 3 2014, 1:38 PM

	Status	Author	Revision
	Closed	mkrizek	D42 Add support for choosing trigger based on config value
	Closed	mkrizek	D40 Make trigger configuration more flexible

Diff 126

conf/settings.cfg.example

1	[buildbot]	1	[buildbot]
2	username = username	2	username = username
3	password = password	3	password = password
4	url = http://localhost/buildbot	4	url = http://localhost/buildbot
5		5
6	[trigger]	6	[trigger]
7	koji_tasks = rpmlint	7	koji_tasks = rpmlint
8	bodhi_tasks = examplebodhi	8	bodhi_tasks = examplebodhi
9	valid_arches = i386,i686,x86_64,noarch	9	valid_arches = i386,i686,x86_64,noarch
10	koji_url = http://koji.fedoraproject.org/kojihub	10	koji_url = http://koji.fedoraproject.org/kojihub
		11	type = StreamTrigger

View Options

jobtriggers/bodhi_msg.py

Show All 13 Lines
14		14
15	class BodhiJobTrigger(fedmsg.consumers.FedmsgConsumer):	15	class BodhiJobTrigger(fedmsg.consumers.FedmsgConsumer):
16	topic = "org.fedoraproject.prod.bodhi.update.request.*"	16	topic = "org.fedoraproject.prod.bodhi.update.request.*"
17	jsonify = False	17	jsonify = False
18	config_key = 'taskotron.bodhijobtrigger.enabled'	18	config_key = 'taskotron.bodhijobtrigger.enabled'
19		19
20	def __init__(self, args, *kw):	20	def __init__(self, args, *kw):
21	super(BodhiJobTrigger, self).__init__(args, *kw)	21	super(BodhiJobTrigger, self).__init__(args, *kw)
22	self.trigger = triggers.StreamTrigger()	22	self.trigger = triggers.get_trigger(config.trigger_type)
23		23
24	def consume(self, message):	24	def consume(self, message):
25	usable_message = fedmsg.encoding.loads(message.body)	25	usable_message = fedmsg.encoding.loads(message.body)
26		26
27	topic = usable_message['topic']	27	topic = usable_message['topic']
28		28
29	if not topic.endswith('stable') and not topic.endswith('testing'):	29	if not topic.endswith('stable') and not topic.endswith('testing'):
30	return	30	return
Show All 11 Lines

View Options

jobtriggers/config.py

1	import ConfigParser	1	import ConfigParser
2	import io	2	import io
3		3
4	defaults = """	4	defaults = """
5	[buildbot]	5	[buildbot]
6	username = username	6	username = username
7	password = password	7	password = password
8	url = http://localhost/buildbot	8	url = http://localhost/buildbot
9		9
10	[trigger]	10	[trigger]
11	koji_tasks = rpmlint	11	koji_tasks = rpmlint
12	bodhi_tasks = examplebodhi	12	bodhi_tasks = examplebodhi
13	valid_arches = i386,i686,x86_64,noarch	13	valid_arches = i386,i686,x86_64,noarch
14	koji_url = http://koji.fedoraproject.org/kojihub	14	koji_url = http://koji.fedoraproject.org/kojihub
		15	type = StreamTrigger
15	"""	16	"""
16		17
17	config = ConfigParser.ConfigParser()	18	config = ConfigParser.ConfigParser()
18	config.readfp(io.BytesIO(defaults))	19	config.readfp(io.BytesIO(defaults))
19	config.read(['/etc/taskotron/trigger.cfg', './conf/trigger.cfg'])	20	config.read(['/etc/taskotron/trigger.cfg', './conf/trigger.cfg'])
20		21
21		22
22	buildbot_username = config.get('buildbot', 'username')	23	buildbot_username = config.get('buildbot', 'username')
23	buildbot_password = config.get('buildbot', 'password')	24	buildbot_password = config.get('buildbot', 'password')
24	buildbot_url = config.get('buildbot', 'url')	25	buildbot_url = config.get('buildbot', 'url')
25		26
26	koji_tasks = config.get('trigger', 'koji_tasks').split(',')	27	koji_tasks = config.get('trigger', 'koji_tasks').split(',')
27	bodhi_tasks = config.get('trigger', 'bodhi_tasks').split(',')	28	bodhi_tasks = config.get('trigger', 'bodhi_tasks').split(',')
28	valid_arches = config.get('trigger', 'valid_arches').split(',')	29	valid_arches = config.get('trigger', 'valid_arches').split(',')
29	koji_url = config.get('trigger', 'koji_url')	30	koji_url = config.get('trigger', 'koji_url')
		31	trigger_type = config.get('trigger', 'type')

View Options

jobtriggers/koji_msg.py

Show All 14 Lines
15		15
16	class KojiJobTrigger(fedmsg.consumers.FedmsgConsumer):	16	class KojiJobTrigger(fedmsg.consumers.FedmsgConsumer):
17	topic = "org.fedoraproject.prod.buildsys.tag"	17	topic = "org.fedoraproject.prod.buildsys.tag"
18	jsonify = False	18	jsonify = False
19	config_key = 'taskotron.kojijobtrigger.enabled'	19	config_key = 'taskotron.kojijobtrigger.enabled'
20		20
21	def __init__(self, args, *kw):	21	def __init__(self, args, *kw):
22	super(KojiJobTrigger, self).__init__(args, *kw)	22	super(KojiJobTrigger, self).__init__(args, *kw)
23	self.trigger = triggers.StreamTrigger()	23	self.trigger = triggers.get_trigger(config.trigger_type)
24		24
25	def consume(self, message):	25	def consume(self, message):
26	usable_message = fedmsg.encoding.loads(message.body)	26	usable_message = fedmsg.encoding.loads(message.body)
27		27
28	tag = usable_message['msg']['tag']	28	tag = usable_message['msg']['tag']
29		29
30	if not tag.endswith('pending'):	30	if not tag.endswith('pending'):
31	return	31	return
Show All 14 Lines

View Options

jobtriggers/triggers.py

Show All 35 Lines		35	s.post('%s/builders/statictasks/force' % config.buildbot_url,
36	data={'forcescheduler': 'rpmcheck',	36		data={'forcescheduler': 'rpmcheck',
37	'reason': 'triggered by fedmsg',	37		'reason': 'triggered by fedmsg',
38	'item': item,	38		'item': item,
39	'item_type': item_type,	39		'item_type': item_type,
40	'taskname': taskname,	40		'taskname': taskname,
41	'arch': arch})	41		'arch': arch})
42		42
43	s.get('%s/logout' % config.buildbot_url)	43		s.get('%s/logout' % config.buildbot_url)
		44
		45
		46		_triggers = {'StreamTrigger': StreamTrigger, 'BuildbotTrigger': BuildbotTrigger}
		47
		48		def get_trigger(trigger_type):
		49		return _triggers[trigger_type]()
			ralphUnsubmitted Not Done (I thought I left this comment earlier, but I must not have hit submit...) This line lead to some confusion. Say a user puts `type = Wat` in the config file. Taskotron will load and start without an error message, and the user will actually get a `StreamTrigger`. (More realistically, imagine that the user has put `type = BuildBotTrigger`. That's a typo where they actually meant `BuildbotTrigger`). Perhaps this should raise a KeyError if the exact trigger name is not found. Something like return _triggers[trigger_type]()
			kparalUnsubmitted Not Done `TaskotronConfigError` might be suitable for this.
			mkrizekAuthorUnsubmitted Not Done Yeah, but do we want to pull libtaskotron as dependency just so we can use TaskotronConfigError? I don't know how much code of libtaskotron will be needed in the trigger in future though. @tflink? @ralph, your point makes sense to me.
			kparalUnsubmitted Not Done Good point. Does taskotron-trigger make sense without having libtaskotron installed? Won't it call `runtask` eventually?

View Options

testing/test_triggers.py

This file was added.

		1		import pytest
		2
		3		from jobtriggers import triggers
		4
		5
		6		class TestTriggers():
		7		def setup_method(self, method):
		8		self.ref_triggername = 'StreamTrigger'
		9
		10		def test_get_valid_trigger(self):
		11		res = triggers.get_trigger(self.ref_triggername)
		12
		13		assert isinstance(res, triggers.StreamTrigger)
		14
		15		def test_get_invalid_trigger(self):
		16		with pytest.raises(KeyError):
		17		triggers.get_trigger('NotExistingRandomTrigger')

Add support for choosing trigger based on config value
ClosedPublic
Actions

Details

Diff Detail

Revision Contents

Diff 126

conf/settings.cfg.example

jobtriggers/bodhi_msg.py

jobtriggers/config.py

jobtriggers/koji_msg.py

jobtriggers/triggers.py

testing/test_triggers.py

Add support for choosing trigger based on config valueClosedPublicActions

Details

Diff Detail

Revision Contents

Diff 126

conf/settings.cfg.example

jobtriggers/bodhi_msg.py

jobtriggers/config.py

jobtriggers/koji_msg.py

jobtriggers/triggers.py

testing/test_triggers.py

Add support for choosing trigger based on config value
ClosedPublic
Actions