Lubuntu/britney2-ubuntu
8
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-release/britney/+git/britney2-ubuntu synced 2025-02-15 16:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename --ubuntu-series option to just --series.

Browse Source
This commit is contained in:
Colin Watson 2014-07-24 15:18:26 +01:00
parent 9dbef8c864
commit d0d4ea5fa8
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
britney.conf
View File

@ -1,16 +1,16 @@
# Configuration file for britney # Configuration file for britney
# Paths for control files # Paths for control files
TESTING = data/%(UBUNTU_SERIES) TESTING = data/%(SERIES)
UNSTABLE = data/%(UBUNTU_SERIES)-proposed UNSTABLE = data/%(SERIES)-proposed
PARTIAL_UNSTABLE = yes PARTIAL_UNSTABLE = yes
# Output # Output
NONINST_STATUS = data/%(UBUNTU_SERIES)/non-installable-status NONINST_STATUS = data/%(SERIES)/non-installable-status
EXCUSES_OUTPUT = output/%(UBUNTU_SERIES)/excuses.html EXCUSES_OUTPUT = output/%(SERIES)/excuses.html
UPGRADE_OUTPUT = output/%(UBUNTU_SERIES)/output.txt UPGRADE_OUTPUT = output/%(SERIES)/output.txt
HEIDI_OUTPUT = output/%(UBUNTU_SERIES)/HeidiResult HEIDI_OUTPUT = output/%(SERIES)/HeidiResult
DELTA_OUTPUT = output/%(UBUNTU_SERIES)/Delta DELTA_OUTPUT = output/%(SERIES)/Delta
# List of release architectures # List of release architectures
ARCHITECTURES = amd64 arm64 armhf i386 powerpc ppc64el ARCHITECTURES = amd64 arm64 armhf i386 powerpc ppc64el

20
britney.py
View File

@ -371,8 +371,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, parser.add_option("", "--series", "--ubuntu-series", action="store", dest="series", default=None,
help="set Ubuntu series name") help="set distribution series name")
(self.options, self.args) = parser.parse_args() (self.options, self.args) = parser.parse_args()
# integrity checks # integrity checks
@ -389,8 +389,8 @@ class Britney(object):
self.MINDAYS = {} self.MINDAYS = {}
self.HINTS = {'command-line': self.HINTS_ALL} self.HINTS = {'command-line': self.HINTS_ALL}
for k, v in [map(string.strip,r.split('=', 1)) for r in file(self.options.config) if '=' in r and not r.strip().startswith('#')]: for k, v in [map(string.strip,r.split('=', 1)) for r in file(self.options.config) if '=' in r and not r.strip().startswith('#')]:
if self.options.ubuntu_series is not None: if self.options.series is not None:
v = v.replace("%(UBUNTU_SERIES)", self.options.ubuntu_series) v = v.replace("%(SERIES)", self.options.series)
if k.startswith("MINDAYS_"): if k.startswith("MINDAYS_"):
self.MINDAYS[k.split("_")[1].lower()] = int(v) self.MINDAYS[k.split("_")[1].lower()] = int(v)
elif k.startswith("HINTS_"): elif k.startswith("HINTS_"):
@ -1745,11 +1745,11 @@ class Britney(object):
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 getattr(self.options, "adt_enable", "no") == "yes" and \ if getattr(self.options, "adt_enable", "no") == "yes" and \
self.options.ubuntu_series: self.options.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.ubuntu_series, debug=adt_debug) self, self.options.series, debug=adt_debug)
autopkgtest_packages = [] autopkgtest_packages = []
autopkgtest_excuses = [] autopkgtest_excuses = []
autopkgtest_excludes = [] autopkgtest_excludes = []
@ -1770,19 +1770,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.ubuntu_series.title()) self.options.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.ubuntu_series.title()) self.options.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.ubuntu_series, jenkins_public, self.options.series,
adtsrc.replace("+", "-")) adtsrc.replace("+", "-"))
private_url = "%s/%s-adt-%s/lastBuild" % ( private_url = "%s/%s-adt-%s/lastBuild" % (
jenkins_private, self.options.ubuntu_series, jenkins_private, self.options.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(

14
britney_nobreakall.conf
View File

@ -1,16 +1,16 @@
# Configuration file for britney # Configuration file for britney
# Paths for control files # Paths for control files
TESTING = data/%(UBUNTU_SERIES) TESTING = data/%(SERIES)
UNSTABLE = data/%(UBUNTU_SERIES)-proposed UNSTABLE = data/%(SERIES)-proposed
PARTIAL_UNSTABLE = yes PARTIAL_UNSTABLE = yes
# Output # Output
NONINST_STATUS = data/%(UBUNTU_SERIES)/non-installable-status NONINST_STATUS = data/%(SERIES)/non-installable-status
EXCUSES_OUTPUT = output/%(UBUNTU_SERIES)/excuses.html EXCUSES_OUTPUT = output/%(SERIES)/excuses.html
UPGRADE_OUTPUT = output/%(UBUNTU_SERIES)/output.txt UPGRADE_OUTPUT = output/%(SERIES)/output.txt
HEIDI_OUTPUT = output/%(UBUNTU_SERIES)/HeidiResult HEIDI_OUTPUT = output/%(SERIES)/HeidiResult
DELTA_OUTPUT = output/%(UBUNTU_SERIES)/Delta DELTA_OUTPUT = output/%(SERIES)/Delta
# List of release architectures # List of release architectures
ARCHITECTURES = amd64 arm64 armhf i386 powerpc ppc64el ARCHITECTURES = amd64 arm64 armhf i386 powerpc ppc64el