From a3da16e7714f032f264a1cd8817f98d102815731 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 22 Feb 2021 08:36:30 -0800 Subject: [PATCH 1/2] disable BuildDependsPolicy This policy has some perverse outcomes, slows down migrations, and doesn't actually ensure build-depends closure in the release pocket --- britney.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/britney.py b/britney.py index 94d4bd7..3f21937 100755 --- a/britney.py +++ b/britney.py @@ -527,7 +527,14 @@ class Britney(object): if getattr(self.options, 'adt_enable') == 'yes': self._policy_engine.add_policy(AutopkgtestPolicy(self.options, self.suite_info)) self._policy_engine.add_policy(AgePolicy(self.options, self.suite_info, MINDAYS)) - self._policy_engine.add_policy(BuildDependsPolicy(self.options, self.suite_info)) + # XXX this policy results in asymmetric enforcement of + # build-dependencies in the release pocket (nothing blocks + # propagation of a new package which will regress build-dep + # satisfaction of another package already in the release pocket, this + # only shows up via the NBS report); and this is a subset of what we + # already get from the rebuild tests, which the reality is we don't + # have capacity to enforce for the whole archive. - vorlon + # self._policy_engine.add_policy(BuildDependsPolicy(self.options, self.suite_info)) self._policy_engine.add_policy(BlockPolicy(self.options, self.suite_info)) # XXX re-enable once https://bugs.launchpad.net/launchpad/+bug/1868558 is fixed # self._policy_engine.add_policy(BuiltUsingPolicy(self.options, self.suite_info)) From ea6450482072405da9e5523a3d083fe53c69d714 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 26 Apr 2021 09:59:18 +0100 Subject: [PATCH 2/2] conf: Update ADT_SWIFT_URL & amqp IP for the new deployment We're shifting autopkgtest to a new deployment which hides the old internal URL. RabbitMQ now lives at a different place too, which has a DNS name. --- britney.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/britney.conf b/britney.conf index 74ecd4b..f5429c3 100644 --- a/britney.conf +++ b/britney.conf @@ -92,7 +92,7 @@ CHECK_BUILDD = no ADT_ENABLE = yes ADT_ARCHES = amd64 i386 armhf ppc64el arm64 -ADT_AMQP = amqp://test_request:password@162.213.33.228 +ADT_AMQP = amqp://test_request:password@autopkgtest-amqp.internal # space separate list of PPAs to add for test requests and for polling results; # the *last* one determines the swift container name ADT_PPAS = @@ -101,7 +101,7 @@ ADT_PPAS = ADT_SHARED_RESULTS_CACHE = # Swift base URL with the results (must be publicly readable and browsable) # or file location if results are pre-fetched -ADT_SWIFT_URL = https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac +ADT_SWIFT_URL = https://autopkgtest.ubuntu.com/results/ # Base URL for autopkgtest site, used for links in the excuses ADT_CI_URL = https://autopkgtest.ubuntu.com/ ADT_HUGE = 20