diff --git a/britney.py b/britney.py index eef23fe..6409072 100755 --- a/britney.py +++ b/britney.py @@ -1942,11 +1942,25 @@ class Britney(object): if not self.options.dry_run: boottest.submit() boottest.collect() + # Boottest Jenkins views location. + jenkins_public = "https://jenkins.qa.ubuntu.com/job" + jenkins_private = ( + "http://d-jenkins.ubuntu-ci:8080/view/%s/view/BootTest/job" % + self.options.series.title()) # Update excuses from the boottest context. for excuse in boottest_excuses: status = boottest.get_status(excuse.name, excuse.ver[1]) label = BootTest.EXCUSE_LABELS.get(status, 'UNKNOWN STATUS') - excuse.addhtml("Boottest result: %s" % (label)) + public_url = "%s/%s-boottest-%s/lastBuild" % ( + jenkins_public, self.options.series, + excuse.name.replace("+", "-")) + private_url = "%s/%s-boottest-%s/lastBuild" % ( + jenkins_private, self.options.series, + excuse.name.replace("+", "-")) + excuse.addhtml( + "Boottest result: %s (Jenkins: public" + ", private)" % ( + label, public_url, private_url)) # Allows hints to force boottest failures/attempts # to be ignored. hints = self.hints.search('force', package=excuse.name) diff --git a/tests/test_boottest.py b/tests/test_boottest.py index 4fb27b3..371e548 100644 --- a/tests/test_boottest.py +++ b/tests/test_boottest.py @@ -239,6 +239,8 @@ args.func() # `Britney` runs and considers binary packages for boottesting # when it is enabled in the configuration, only binaries needed # in the phone image are considered for boottesting. + # The boottest status is presented along with its corresponding + # jenkins job urls for the public and the private servers. # 'in progress' tests blocks package promotion. context = [ ('green', {'Source': 'green', 'Version': '1.1~beta', @@ -247,11 +249,19 @@ args.func() 'Architecture': 'armhf', 'Depends': 'libc6 (>= 0.9)'}), ] + public_jenkins_url = ( + 'https://jenkins.qa.ubuntu.com/job/series-boottest-green/' + 'lastBuild') + private_jenkins_url = ( + 'http://d-jenkins.ubuntu-ci:8080/view/Series/view/BootTest/' + 'job/series-boottest-green/lastBuild') self.do_test( context, [r'\bgreen\b.*>1 to .*>1.1~beta<', - '