From d975b2fc39f00ffd3cf6aa40b00605370b80a0f2 Mon Sep 17 00:00:00 2001 From: Paul Gevers Date: Thu, 19 Oct 2017 19:18:18 +0200 Subject: [PATCH] Make the huge queue in autopkgtest optional --- britney.conf.template | 3 +++ britney2/policies/autopkgtest.py | 7 +++++-- tests/__init__.py | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/britney.conf.template b/britney.conf.template index 56fd614..6b7537c 100644 --- a/britney.conf.template +++ b/britney.conf.template @@ -127,6 +127,9 @@ ADT_SHARED_RESULTS_CACHE = ADT_SWIFT_URL = file:///path/to/britney/state/debci.json # Base URL for autopkgtest site, used for links in the excuses ADT_CI_URL = https://example.com/ +# Enable the huge queue for packages that trigger vast amounts of tests to not +# starve the regular queue +#ADT_HUGE = 20 # Autopkgtest results can be used to influence the aging, leave # ADT_REGRESSION_PENALTY empty to have regressions block migration diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py index fc3977c..6955b32 100644 --- a/britney2/policies/autopkgtest.py +++ b/britney2/policies/autopkgtest.py @@ -191,8 +191,11 @@ class AutopkgtestPolicy(BasePolicy): for arch in self.adt_arches: # request tests (unless they were already requested earlier or have a result) tests = self.tests_for_source(source_name, source_data_srcdist.version, arch) - # TODO: this value should be an option - is_huge = len(tests) > 20 + is_huge = False + try: + is_huge = len(tests) > int(self.options.adt_huge) + except AttributeError: + pass for (testsrc, testver) in tests: self.pkg_test_request(testsrc, arch, trigger, huge=is_huge) (result, real_ver, url) = self.pkg_test_result(testsrc, testver, arch, trigger) diff --git a/tests/__init__.py b/tests/__init__.py index 3f10c10..2f91d6e 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -392,6 +392,7 @@ ADT_SHARED_RESULTS_CACHE = ADT_SWIFT_URL = http://localhost:18085 ADT_CI_URL = https://autopkgtest.ubuntu.com/ +ADT_HUGE = 20 ADT_SUCCESS_BOUNTY = ADT_REGRESSION_PENALTY =