Differential D161

Trigger depcheck on only x86_64
ClosedPublic
Actions

Authored by mkrizek on Jun 26 2014, 9:38 AM.

Details

Reviewers
tflink
Maniphest Tasks
T256: trigger depcheck on only x86_64
Commits
rTRGR5209253715f5: Trigger depcheck on only x86_64
Summary

Dirty hack, but it's as good as it gets for now I guess. Fixes T256

Test Plan

Tests amended. Ran fedmsg-hub locally, worked for me.

Diff Detail

Repository
rTRGR taskotron-trigger
Lint
Lint Skipped
Unit
Unit Tests Skipped
mkrizek retitled this revision from to Trigger depcheck on only x86_64.Jun 26 2014, 9:38 AM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added a reviewer: tflink.
mkrizek added a task: T256: trigger depcheck on only x86_64.
tflink accepted this revision.Jun 26 2014, 2:09 PM

Looks good to me

This revision is now accepted and ready to land.Jun 26 2014, 2:09 PM
mkrizek closed this revision.Jun 26 2014, 3:06 PM
mkrizek updated this revision to Diff 483.

Closed by commit rTRGR5209253715f5 (authored by @mkrizek).

Revision Contents

Diff 483

View Options

conf/trigger.cfg.example

1[buildbot] 1​[buildbot]
2username = username 2​username = username
3password = password 3​password = password
4url = http://localhost/buildbot 4​url = http://localhost/buildbot
5 5​
6[trigger] 6​[trigger]
7koji_tasks = rpmlint 7​koji_tasks = rpmlint
8bodhi_to_koji_tag_tasks = upgradepath 8​bodhi_to_koji_tag_tasks = upgradepath,depcheck
9bodhi_tasks = examplebodhi 9​bodhi_tasks = examplebodhi
10valid_arches = i386,i686,x86_64,noarch 10​valid_arches = i386,i686,x86_64,noarch
11koji_url = http://koji.fedoraproject.org/kojihub 11​koji_url = http://koji.fedoraproject.org/kojihub
12type = StreamTrigger 12​type = StreamTrigger
13blacklist_releases = el5,el6 13​blacklist_releases = el5,el6
14job_logging = False 14​job_logging = False
15joblog_file = /var/log/taskotron-trigger/jobs.csv 15​joblog_file = /var/log/taskotron-trigger/jobs.csv
16fuse_delay = 1000 ; seconds 16​fuse_delay = 1000 ; seconds
17​x86_64_only = depcheck
View Options

jobtriggers/__init__.py

1import fedmsg.consumers 1​import fedmsg.consumers
2 2​
3from . import config, triggers, utils 3​from . import config, triggers, utils
4 4​
5class JobTrigger(fedmsg.consumers.FedmsgConsumer): 5​class JobTrigger(fedmsg.consumers.FedmsgConsumer):
6 def __init__(self, *args, **kw): 6​ def __init__(self, *args, **kw):
7 super(JobTrigger, self).__init__(*args, **kw) 7​ super(JobTrigger, self).__init__(*args, **kw)
8 self.trigger = triggers.get_trigger(config.trigger_type) 8​ self.trigger = triggers.get_trigger(config.trigger_type)
9 9​
10 def trigger_tasks(self, item, item_type, tasks, arches): 10​ def trigger_tasks(self, item, item_type, tasks, arches):
11 for task in tasks: 11​ for task in tasks:
12 for arch in arches: 12​ for arch in arches:
13​ # XXX hack T256
14​ if task in config.x86_64_only and arch != "x86_64":
15​ continue
16​
13 self.log.info('triggering %s for %s on %s', task, item, arch) 17​ self.log.info('triggering %s for %s on %s', task, item, arch)
14 18​
15 if config.job_logging: 19​ if config.job_logging:
16 try: 20​ try:
17 utils.log_job(config.joblog_file, item, item_type, task, arch) 21​ utils.log_job(config.joblog_file, item, item_type, task, arch)
18 except IOError, e: 22​ except IOError, e:
19 self.log.warning('Cannot log a job into %s', config.joblog_file) 23​ self.log.warning('Cannot log a job into %s', config.joblog_file)
20 24​
21 output = self.trigger.trigger_job(item, item_type, task, arch) 25​ output = self.trigger.trigger_job(item, item_type, task, arch)
22 for line in output: 26​ for line in output:
23 self.log.info(line) 27​ self.log.info(line)
View Options

jobtriggers/config.py

1import ConfigParser 1​import ConfigParser
2import io 2​import io
3 3​
4defaults = """ 4​defaults = """
5[buildbot] 5​[buildbot]
6username = username 6​username = username
7password = password 7​password = password
8url = http://localhost/buildbot 8​url = http://localhost/buildbot
9 9​
10[trigger] 10​[trigger]
11koji_tasks = rpmlint 11​koji_tasks = rpmlint
12bodhi_to_koji_tag_tasks = upgradepath 12​bodhi_to_koji_tag_tasks = upgradepath,depcheck
13bodhi_tasks = examplebodhi 13​bodhi_tasks = examplebodhi
14valid_arches = i386,i686,x86_64,noarch 14​valid_arches = i386,i686,x86_64,noarch
15koji_url = http://koji.fedoraproject.org/kojihub 15​koji_url = http://koji.fedoraproject.org/kojihub
16type = StreamTrigger 16​type = StreamTrigger
17blacklist_releases = el5,el6 17​blacklist_releases = el5,el6
18job_logging = False 18​job_logging = False
19joblog_file = /var/log/taskotron-trigger/jobs.cvs 19​joblog_file = /var/log/taskotron-trigger/jobs.cvs
20fuse_delay = 1000 ; seconds 20​fuse_delay = 1000 ; seconds
21​x86_64_only = depcheck
21""" 22​"""
22 23​
23config = ConfigParser.ConfigParser() 24​config = ConfigParser.ConfigParser()
24config.readfp(io.BytesIO(defaults)) 25​config.readfp(io.BytesIO(defaults))
25config.read(['/etc/taskotron/trigger.cfg', './conf/trigger.cfg']) 26​config.read(['/etc/taskotron/trigger.cfg', './conf/trigger.cfg'])
26 27​
27 28​
28buildbot_username = config.get('buildbot', 'username') 29​buildbot_username = config.get('buildbot', 'username')
29buildbot_password = config.get('buildbot', 'password') 30​buildbot_password = config.get('buildbot', 'password')
30buildbot_url = config.get('buildbot', 'url') 31​buildbot_url = config.get('buildbot', 'url')
31 32​
32koji_tasks = [e.strip() for e in config.get('trigger', 'koji_tasks').split(',')] 33​koji_tasks = [e.strip() for e in config.get('trigger', 'koji_tasks').split(',')]
33bodhi_to_koji_tag_tasks = [e.strip() for e in config.get('trigger', 'bodhi_to_koji_tag_tasks').split(',')] 34​bodhi_to_koji_tag_tasks = [e.strip() for e in config.get('trigger', 'bodhi_to_koji_tag_tasks').split(',')]
34bodhi_tasks = [e.strip() for e in config.get('trigger', 'bodhi_tasks').split(',')] 35​bodhi_tasks = [e.strip() for e in config.get('trigger', 'bodhi_tasks').split(',')]
35valid_arches = [e.strip() for e in config.get('trigger', 'valid_arches').split(',')] 36​valid_arches = [e.strip() for e in config.get('trigger', 'valid_arches').split(',')]
36koji_url = config.get('trigger', 'koji_url') 37​koji_url = config.get('trigger', 'koji_url')
37trigger_type = config.get('trigger', 'type') 38​trigger_type = config.get('trigger', 'type')
38blacklist_releases = [e.strip() for e in config.get('trigger', 'blacklist_releases').split(',')] 39​blacklist_releases = [e.strip() for e in config.get('trigger', 'blacklist_releases').split(',')]
39job_logging = True if config.get('trigger', 'job_logging') == 'True' else False 40​job_logging = True if config.get('trigger', 'job_logging') == 'True' else False
40joblog_file = config.get('trigger', 'joblog_file') 41​joblog_file = config.get('trigger', 'joblog_file')
41fuse_delay = int(config.get('trigger', 'fuse_delay')) # seconds 42​fuse_delay = int(config.get('trigger', 'fuse_delay')) # seconds
43​x86_64_only = [e.strip() for e in config.get('trigger', 'x86_64_only').split(',')]
View Options

testing/test_bodhi_trigger.py

Show All 28 Lines11 def prepare(self, monkeypatch):
29 29​
30 monkeypatch.setattr(bodhi_msg.utils, 'get_arches', lambda *a, **k: self.ref_validarches) 30​ monkeypatch.setattr(bodhi_msg.utils, 'get_arches', lambda *a, **k: self.ref_validarches)
31 31​
32 bodhi_msg.config.bodhi_tasks = self.ref_tasks 32​ bodhi_msg.config.bodhi_tasks = self.ref_tasks
33 bodhi_msg.config.bodhi_to_koji_tag_tasks = self.ref_tasks 33​ bodhi_msg.config.bodhi_to_koji_tag_tasks = self.ref_tasks
34 bodhi_msg.config.valid_arches = self.ref_validarches 34​ bodhi_msg.config.valid_arches = self.ref_validarches
35 bodhi_msg.config.blacklist_releases = self.ref_blacklist_releases 35​ bodhi_msg.config.blacklist_releases = self.ref_blacklist_releases
36 bodhi_msg.config.job_logging = False 36​ bodhi_msg.config.job_logging = False
37​ bodhi_msg.config.x86_64_only = 'bodhi_task1'
37 38​
38 def _create_msg(self, ref_updatetitle, ref_dist_tag, ref_nvr, ref_topic, ref_status): 39​ def _create_msg(self, ref_updatetitle, ref_dist_tag, ref_nvr, ref_topic, ref_status):
39 self.ref_message = Bunch(body='{"msg": {"agent": "lmacken",\ 40​ self.ref_message = Bunch(body='{"msg": {"agent": "lmacken",\
40 "update": {"submitter": "lmacken",\ 41​ "update": {"submitter": "lmacken",\
41 "title": "%s",\ 42​ "title": "%s",\
42 "release": {"dist_tag": "%s"},\ 43​ "release": {"dist_tag": "%s"},\
43 "builds": [{"nvr": "%s"}],\ 44​ "builds": [{"nvr": "%s"}],\
44 "status": "%s"}},\ 45​ "status": "%s"}},\
45 "topic": "%s"}' % 46​ "topic": "%s"}' %
46 (ref_updatetitle, ref_dist_tag, ref_nvr, ref_status, ref_topic)) 47​ (ref_updatetitle, ref_dist_tag, ref_nvr, ref_status, ref_topic))
47 48​
48 def test_consume(self): 49​ def test_consume(self):
49 self.helper.consume(self.ref_message) 50​ self.helper.consume(self.ref_message)
50 51​
51 trigger_calls = self.helper.trigger.trigger_job.calls() 52​ trigger_calls = self.helper.trigger.trigger_job.calls()
52 53​
53 assert len(trigger_calls) == 4 54​ assert len(trigger_calls) == 3
54 55​
55 assert trigger_calls[0][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[0], self.ref_validarches[0]) 56​ assert trigger_calls[0][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[0], self.ref_validarches[1])
56 assert trigger_calls[1][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[0], self.ref_validarches[1]) 57​ assert trigger_calls[1][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[1], self.ref_validarches[0])
57 assert trigger_calls[2][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[1], self.ref_validarches[0]) 58​ assert trigger_calls[2][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[1], self.ref_validarches[1])
58 assert trigger_calls[3][1] == (self.ref_updatetitle, 'bodhi_id', self.ref_tasks[1], self.ref_validarches[1]) ​
59 59​
60 def test_consume_delayed_queues(self): 60​ def test_consume_delayed_queues(self):
61 self.helper.consume(self.ref_message) 61​ self.helper.consume(self.ref_message)
62 62​
63 assert self.helper.queued_tags == set([self.ref_koji_tag]) 63​ assert self.helper.queued_tags == set([self.ref_koji_tag])
64 assert self.helper.queued_arches == set(self.ref_validarches) 64​ assert self.helper.queued_arches == set(self.ref_validarches)
65 65​
66 def test_consume_delayed_queues_kojitag_not_pending(self): 66​ def test_consume_delayed_queues_kojitag_not_pending(self):
Show All 35 Lines
102 def test_delayed_consume(self): 102​ def test_delayed_consume(self):
103 self.helper.queued_tags = [self.ref_koji_tag] 103​ self.helper.queued_tags = [self.ref_koji_tag]
104 self.helper.queued_arches = self.ref_validarches 104​ self.helper.queued_arches = self.ref_validarches
105 105​
106 self.helper.delayed_consume() 106​ self.helper.delayed_consume()
107 107​
108 trigger_calls = self.helper.trigger.trigger_job.calls() 108​ trigger_calls = self.helper.trigger.trigger_job.calls()
109 109​
110 assert len(trigger_calls) == 4 110​ assert len(trigger_calls) == 3
111 111​
112 assert trigger_calls[0][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[0], self.ref_validarches[0]) 112​ assert trigger_calls[0][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[0], self.ref_validarches[1])
113 assert trigger_calls[1][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[0], self.ref_validarches[1]) 113​ assert trigger_calls[1][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[1], self.ref_validarches[0])
114 assert trigger_calls[2][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[1], self.ref_validarches[0]) 114​ assert trigger_calls[2][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[1], self.ref_validarches[1])
115 assert trigger_calls[3][1] == (self.ref_koji_tag, 'koji_tag', self.ref_tasks[1], self.ref_validarches[1]) ​
116 115​
117 assert self.helper.queued_tags == set() 116​ assert self.helper.queued_tags == set()
118 assert self.helper.queued_arches == set() 117​ assert self.helper.queued_arches == set()