Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-15 04:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Comment ADT_AMQP and ADT_SWIFT_URL config options

Browse Source 
Their default values are invalid and must be set locally. But as
britney1-ubuntu copies these into production, we would run with an invalid
config with an unmodified config file.
This commit is contained in:
Martin Pitt 2015-07-14 07:55:30 +02:00
parent 13a3ec2593
commit cb66355e95
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
britney.conf
View File

@ -66,9 +66,9 @@ ADT_ENABLE = yes
ADT_DEBUG = no ADT_DEBUG = no
ADT_ARCHES = amd64 i386 ADT_ARCHES = amd64 i386
# comment this to disable autopkgtest requests # comment this to disable autopkgtest requests
ADT_AMQP = ampq://user:pwd@amqp.example.com #ADT_AMQP = amqp://user:pwd@amqp.example.com
# Swift base URL with the results (must be publicly readable and browsable) # Swift base URL with the results (must be publicly readable and browsable)
ADT_SWIFT_URL = https://objectstorage.mycloud.example.com/v1/AUTH_autopkgtest #ADT_SWIFT_URL = https://objectstorage.mycloud.example.com/v1/AUTH_autopkgtest
BOOTTEST_ENABLE = yes BOOTTEST_ENABLE = yes
BOOTTEST_DEBUG = yes BOOTTEST_DEBUG = yes

4
britney_nobreakall.conf
View File

@ -66,6 +66,6 @@ ADT_ENABLE = yes
ADT_DEBUG = no ADT_DEBUG = no
ADT_ARCHES = amd64 i386 ADT_ARCHES = amd64 i386
# comment this to disable autopkgtest requests # comment this to disable autopkgtest requests
ADT_AMQP = ampq://user:pwd@amqp.example.com #ADT_AMQP = amqp://user:pwd@amqp.example.com
# Swift base URL with the results (must be publicly readable and browsable) # Swift base URL with the results (must be publicly readable and browsable)
ADT_SWIFT_URL = https://objectstorage.mycloud.example.com/v1/AUTH_autopkgtest #ADT_SWIFT_URL = https://objectstorage.mycloud.example.com/v1/AUTH_autopkgtest

4
tests/test_autopkgtest.py
View File

@ -39,9 +39,9 @@ class TestAutoPkgTest(TestBase):
for line in fileinput.input(self.britney_conf, inplace=True): for line in fileinput.input(self.britney_conf, inplace=True):
if line.startswith('BOOTTEST_ENABLE'): if line.startswith('BOOTTEST_ENABLE'):
print('BOOTTEST_ENABLE = no') print('BOOTTEST_ENABLE = no')
elif line.startswith('ADT_AMQP'): elif line.startswith('#ADT_AMQP'):
print('ADT_AMQP = file://%s' % self.fake_amqp) print('ADT_AMQP = file://%s' % self.fake_amqp)
elif line.startswith('ADT_SWIFT_URL'): elif line.startswith('#ADT_SWIFT_URL'):
print('ADT_SWIFT_URL = http://localhost:18085') print('ADT_SWIFT_URL = http://localhost:18085')
else: else:
sys.stdout.write(line) sys.stdout.write(line)