Merge branch 'master' of git+ssh://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu into sil2100/private-runs

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/
 # Swift identity with read access to the private result container
 # (this is required whenever a private PPA is used for testing)
 ADT_SWIFT_USER    = 

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))