Differential D190

Do not schedule upgradepath for *-testing-pending
ClosedPublic
Actions

Authored by mkrizek on Jul 18 2014, 11:00 AM.

Details

Reviewers
tflink
Commits
rTRGR52b71bf00318: Do not schedule upgradepath for *-testing-pending
Summary

Upgradepath does not support updates-testing-pending tag and so we avoid having failures in buildbot by not scheduling the test for the tag.

Test Plan

Test added. 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 Do not schedule upgradepath for *-testing-pending.Jul 18 2014, 11:00 AM
mkrizek updated this object.
mkrizek edited the test plan for this revision. (Show Details)
mkrizek added a reviewer: tflink.
tflink accepted this revision.Jul 18 2014, 1:17 PM

Agreed that it's a bit ugly but I don't have any better ideas at the moment. Looks good to me

This revision is now accepted and ready to land.Jul 18 2014, 1:17 PM
mkrizek closed this revision.Jul 21 2014, 10:25 AM
mkrizek updated this revision to Diff 553.

Closed by commit rTRGR52b71bf00318 (authored by @mkrizek).

Revision Contents

Diff 553

View Options

jobtriggers/koji_tag_msg.py

Show All 21 Lines17 def __init__(self, *args, **kw):
22 # check for bodhi_to_koji_tags tasks queue every config.fuse_delay seconds 22​ # check for bodhi_to_koji_tags tasks queue every config.fuse_delay seconds
23 lc = LoopingCall(self.delayed_consume) 23​ lc = LoopingCall(self.delayed_consume)
24 lc.start(config.fuse_delay) 24​ lc.start(config.fuse_delay)
25 25​
26 def delayed_consume(self): 26​ def delayed_consume(self):
27 if self.queued_tags: 27​ if self.queued_tags:
28 try: 28​ try:
29 for tag in self.queued_tags: 29​ for tag in self.queued_tags:
30​ # XXX ugly: do not schedule upgradepath for updates-testing-pending
31​ tasks = config.koji_tag_changed_tasks
32​ if tag.endswith('testing-pending'):
33​ tasks.remove('upgradepath')
30 # it is sufficient to run depcheck and upgradepath only on one arch 34​ # it is sufficient to run depcheck and upgradepath only on one arch
31 # XXX hardcoding X86_64 35​ # XXX hardcoding X86_64
32 self.trigger_tasks(tag, ITEM_TYPE, config.koji_tag_changed_tasks, ['x86_64']) 36​ self.trigger_tasks(tag, ITEM_TYPE, tasks, ['x86_64'])
33 finally: 37​ finally:
34 self.queued_tags = set() 38​ self.queued_tags = set()
35 else: 39​ else:
36 self.log.debug("Woke up, but there were no messages.") 40​ self.log.debug("Woke up, but there were no messages.")
37 41​
38 def consume(self, message): 42​ def consume(self, message):
39 usable_message = fedmsg.encoding.loads(message.body) 43​ usable_message = fedmsg.encoding.loads(message.body)
40 44​
41 koji_tag = usable_message['msg']['tag'] 45​ koji_tag = usable_message['msg']['tag']
42 46​
43 # we want only pending tags 47​ # we want only pending tags
44 if not koji_tag.endswith('pending'): 48​ if not koji_tag.endswith('pending'):
45 return 49​ return
46 50​
47 if not len(self.queued_tags): 51​ if not len(self.queued_tags):
48 self.log.info('setting fuse (%d seconds) for koji_tag %s', config.fuse_delay, koji_tag) 52​ self.log.info('setting fuse (%d seconds) for koji_tag %s', config.fuse_delay, koji_tag)
49 else: 53​ elif koji_tag not in self.queued_tags:
50 self.log.info('adding koji_tag %s to the fuse queue', koji_tag) 54​ self.log.info('adding koji_tag %s to the fuse queue', koji_tag)
51 55​
52 self.queued_tags.add(koji_tag) 56​ self.queued_tags.add(koji_tag)
View Options

testing/test_koji_tag_trigger.py

1import pytest 1​import pytest
2from dingus import Dingus 2​from dingus import Dingus
3from bunch import Bunch 3​from bunch import Bunch
4 4​
5from jobtriggers import koji_tag_msg 5​from jobtriggers import koji_tag_msg
6 6​
7 7​
8@pytest.mark.usefixtures('prepare') 8​@pytest.mark.usefixtures('prepare')
9class TestKojiTagChangedJobTrigger(): 9​class TestKojiTagChangedJobTrigger():
10 @pytest.fixture 10​ @pytest.fixture
11 def prepare(self, monkeypatch): 11​ def prepare(self, monkeypatch):
12 self.ref_name = 'stage' 12​ self.ref_name = 'stage'
13 self.ref_version = '4.1.1' 13​ self.ref_version = '4.1.1'
14 self.ref_release = '3.fc18' 14​ self.ref_release = '3.fc18'
15 self.ref_tag = 'f18-updates-testing-pending' 15​ self.ref_tag = 'f18-updates-pending'
16 self.ref_nvr = '%s-%s-%s' % (self.ref_name, self.ref_version, self.ref_release) 16​ self.ref_nvr = '%s-%s-%s' % (self.ref_name, self.ref_version, self.ref_release)
17 17​
18 self.ref_tasks = ['koji_tag_task1', 'koji_tag_task2'] 18​ self.ref_tasks = ['depcheck', 'upgradepath']
19 self.ref_arch = 'x86_64' 19​ self.ref_arch = 'x86_64'
20 self.ref_blacklist_releases= ['el5', 'el6'] 20​ self.ref_blacklist_releases= ['el5', 'el6']
21 21​
22 self._create_msg(self.ref_name, self.ref_release, self.ref_tag, self.ref_version) 22​ self._create_msg(self.ref_name, self.ref_release, self.ref_tag, self.ref_version)
23 23​
24 stub_hub = Bunch(config=Bunch(get=0)) 24​ stub_hub = Bunch(config=Bunch(get=0))
25 self.helper = koji_tag_msg.KojiTagChangedJobTrigger(stub_hub) 25​ self.helper = koji_tag_msg.KojiTagChangedJobTrigger(stub_hub)
26 26​
Show All 37 Lines52 def test_delayed_consume(self):
64 assert self.helper.queued_tags == set() 64​ assert self.helper.queued_tags == set()
65 65​
66 def test_consume_kojitag_not_pending(self): 66​ def test_consume_kojitag_not_pending(self):
67 ref_tag = 'f18-updates-testing' 67​ ref_tag = 'f18-updates-testing'
68 self._create_msg(self.ref_name, self.ref_release, ref_tag, self.ref_version) 68​ self._create_msg(self.ref_name, self.ref_release, ref_tag, self.ref_version)
69 self.helper.consume(self.ref_message) 69​ self.helper.consume(self.ref_message)
70 70​
71 assert self.helper.queued_tags == set() 71​ assert self.helper.queued_tags == set()
72​
73​ def test_delayed_consume_upgradepath(self):
74​ ref_tag = 'f18-updates-testing-pending'
75​ self.helper.queued_tags = [ref_tag]
76​
77​ self.helper.delayed_consume()
78​
79​ trigger_calls = self.helper.trigger.trigger_job.calls()
80​
81​ assert len(trigger_calls) == 1
82​
83​ assert trigger_calls[0][1] == (ref_tag, koji_tag_msg.ITEM_TYPE, self.ref_tasks[0], self.ref_arch)
84​
85​ assert self.helper.queued_tags == set()