Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-05-23 08:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Colin Watson 2014-06-05 11:42:14 +01:00
parent a6fbf59cbc
commit 6ac23e6d67
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
britney.conf
View File

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

15
britney.py
View File

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

4
britney_nobreakall.conf
View File

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