From cb66355e95adf6e7c0421ce68b7c7c122b2122a8 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 14 Jul 2015 07:55:30 +0200 Subject: [PATCH] Comment ADT_AMQP and ADT_SWIFT_URL config options 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. --- britney.conf | 4 ++-- britney_nobreakall.conf | 4 ++-- tests/test_autopkgtest.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/britney.conf b/britney.conf index 28e6be9..d0bb645 100644 --- a/britney.conf +++ b/britney.conf @@ -66,9 +66,9 @@ ADT_ENABLE = yes ADT_DEBUG = no ADT_ARCHES = amd64 i386 # 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) -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_DEBUG = yes diff --git a/britney_nobreakall.conf b/britney_nobreakall.conf index 8db5a1f..cea1a50 100644 --- a/britney_nobreakall.conf +++ b/britney_nobreakall.conf @@ -66,6 +66,6 @@ ADT_ENABLE = yes ADT_DEBUG = no ADT_ARCHES = amd64 i386 # 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) -ADT_SWIFT_URL = https://objectstorage.mycloud.example.com/v1/AUTH_autopkgtest +#ADT_SWIFT_URL = https://objectstorage.mycloud.example.com/v1/AUTH_autopkgtest diff --git a/tests/test_autopkgtest.py b/tests/test_autopkgtest.py index 42f477f..8fe3654 100644 --- a/tests/test_autopkgtest.py +++ b/tests/test_autopkgtest.py @@ -39,9 +39,9 @@ class TestAutoPkgTest(TestBase): for line in fileinput.input(self.britney_conf, inplace=True): if line.startswith('BOOTTEST_ENABLE'): print('BOOTTEST_ENABLE = no') - elif line.startswith('ADT_AMQP'): + elif line.startswith('#ADT_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') else: sys.stdout.write(line)