Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-10-31 00:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Send PPA test requests into PPA AMQP queues

Browse Source 
This separates them from Ubuntu and upstream test requests, avoids that any of
those can completely starve the other two, and makes queues easier to manage.
This commit is contained in:
Martin Pitt 2016-03-03 12:49:35 +01:00
parent 53c338581b
commit f4fd77c9ed
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autopkgtest.py
View File

@ -458,8 +458,10 @@ class AutoPackageTest(object):
params = {'triggers': [trigger]} params = {'triggers': [trigger]}
if self.britney.options.adt_ppas: if self.britney.options.adt_ppas:
params['ppas'] = self.britney.options.adt_ppas params['ppas'] = self.britney.options.adt_ppas
params = json.dumps(params) qname = 'debci-ppa-%s-%s' % (self.series, arch)
else:
qname = 'debci-%s-%s' % (self.series, arch) qname = 'debci-%s-%s' % (self.series, arch)
params = json.dumps(params)
if self.amqp_channel: if self.amqp_channel:
self.amqp_channel.basic_publish(amqp.Message(src + '\n' + params), routing_key=qname) self.amqp_channel.basic_publish(amqp.Message(src + '\n' + params), routing_key=qname)

5
tests/test_autopkgtest.py
View File

@ -1731,8 +1731,9 @@ class T(TestBase):
}}) }})
for arch in ['i386', 'amd64']: for arch in ['i386', 'amd64']:
self.assertTrue('debci-series-%s:lightgreen {"triggers": ["lightgreen/2"], "ppas": ["joe/foo", "awesome-developers/staging"]}' % arch in self.amqp_requests or self.assertTrue('debci-ppa-series-%s:lightgreen {"triggers": ["lightgreen/2"], "ppas": ["joe/foo", "awesome-developers/staging"]}' % arch in self.amqp_requests or
'debci-series-%s:lightgreen {"ppas": ["joe/foo", "awesome-developers/staging"], "triggers": ["lightgreen/2"]}' % arch in self.amqp_requests) 'debci-ppa-series-%s:lightgreen {"ppas": ["joe/foo", "awesome-developers/staging"], "triggers": ["lightgreen/2"]}' % arch in self.amqp_requests,
self.amqp_requests)
self.assertEqual(len(self.amqp_requests), 2) self.assertEqual(len(self.amqp_requests), 2)
# add results to PPA specific swift container # add results to PPA specific swift container