Add new --ubuntu-series option, replacing ADT_SERIES in the configuration file. Add ADT_ENABLE configuration file entry to allow disabling autopkgtests (previously done by setting ADT_SERIES to the empty string).

britney.conf

@@ -62,8 +62,6 @@ SMOOTH_UPDATES    = badgers
 
 REMOVE_OBSOLETE   = no
 
-# autopkgtest needs to know the series name; set to the empty string to
-# disable autopkgtest
-ADT_SERIES        = utopic
+ADT_ENABLE        = yes
 ADT_DEBUG         = no
 ADT_ARCHES        = amd64 i386

britney.py

@@ -367,6 +367,8 @@ class Britney(object):
                                help="do not build the non-installability status, use the cache from file")
         parser.add_option("", "--print-uninst", action="store_true", dest="print_uninst", default=False,
                                help="just print a summary of uninstallable packages")
+        parser.add_option("", "--ubuntu-series", action="store", dest="ubuntu_series", default=None,
+                               help="set Ubuntu series name")
         (self.options, self.args) = parser.parse_args()
         
         # integrity checks
@@ -1723,11 +1725,12 @@ class Britney(object):
         # extract the not considered packages, which are in the excuses but not in upgrade_me
         unconsidered = [e.name for e in self.excuses if e.name not in upgrade_me]
 
-        if self.options.adt_series:
+        if getattr(self.options, "adt_enable", "no") == "yes" and \
+           self.options.ubuntu_series:
             # trigger autopkgtests for valid candidates
             adt_debug = getattr(self.options, "adt_debug", "no") == "yes"
             autopkgtest = AutoPackageTest(
-                self, self.options.adt_series, debug=adt_debug)
+                self, self.options.ubuntu_series, debug=adt_debug)
             autopkgtest_packages = []
             autopkgtest_excuses = []
             autopkgtest_excludes = []
@@ -1748,19 +1751,19 @@ class Britney(object):
                 autopkgtest.collect()
             jenkins_public = (
                 "https://jenkins.qa.ubuntu.com/view/%s/view/AutoPkgTest/job" %
-                self.options.adt_series.title())
+                self.options.ubuntu_series.title())
             jenkins_private = (
                 "http://d-jenkins.ubuntu-ci:8080/view/%s/view/AutoPkgTest/job" %
-                self.options.adt_series.title())
+                self.options.ubuntu_series.title())
             for e in autopkgtest_excuses:
                 adtpass = True
                 for status, adtsrc, adtver in autopkgtest.results(
                         e.name, e.ver[1]):
                     public_url = "%s/%s-adt-%s/lastBuild" % (
-                        jenkins_public, self.options.adt_series,
+                        jenkins_public, self.options.ubuntu_series,
                         adtsrc.replace("+", "-"))
                     private_url = "%s/%s-adt-%s/lastBuild" % (
-                        jenkins_private, self.options.adt_series,
+                        jenkins_private, self.options.ubuntu_series,
                         adtsrc.replace("+", "-"))
                     adt_label = ADT_EXCUSES_LABELS.get(status, status)
                     e.addhtml(

britney_nobreakall.conf

@@ -60,8 +60,6 @@ SMOOTH_UPDATES =
 
 REMOVE_OBSOLETE   = no
 
-# autopkgtest needs to know the series name; set to the empty string to
-# disable autopkgtest
-ADT_SERIES        = utopic
+ADT_ENABLE        = yes
 ADT_DEBUG         = no
 ADT_ARCHES        = amd64 i386