From e2425bb6fbc9bfc42f5028d24605154de317d8bb Mon Sep 17 00:00:00 2001 From: Robert Bruce Park Date: Tue, 19 Jan 2016 17:33:01 -0800 Subject: [PATCH] Make Heidi optional. --- britney.conf | 2 +- britney.py | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/britney.conf b/britney.conf index 99991ec..984d6d0 100644 --- a/britney.conf +++ b/britney.conf @@ -66,7 +66,7 @@ REMOVE_OBSOLETE = no ADT_ENABLE = yes ADT_DEBUG = no ADT_ARCHES = amd64 i386 armhf ppc64el -ADT_AMQP = amqp://test_request:password@162.213.33.228 +ADT_AMQP = amqp://localhost # Swift base URL with the results (must be publicly readable and browsable) ADT_SWIFT_URL = https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac # space separate list of PPAs to add for test requests and for polling results; diff --git a/britney.py b/britney.py index 03eef02..c6f7054 100755 --- a/britney.py +++ b/britney.py @@ -453,7 +453,7 @@ class Britney(object): not getattr(self.options, k.lower()): setattr(self.options, k.lower(), v) - if not hasattr(self.options, "heidi_delta_output"): + if self.options.heidi_output and not hasattr(self.options, "heidi_delta_output"): self.options.heidi_delta_output = self.options.heidi_output + "Delta" self.options.nobreakall_arches = self.options.nobreakall_arches.split() @@ -3023,14 +3023,15 @@ class Britney(object): except AttributeError: self.write_dates(self.options.testing, self.dates) - # write HeidiResult - self.__log("Writing Heidi results to %s" % self.options.heidi_output) - write_heidi(self.options.heidi_output, self.sources["testing"], - self.binaries["testing"]) + if self.options.heidi_output: + # write HeidiResult + self.__log("Writing Heidi results to %s" % self.options.heidi_output) + write_heidi(self.options.heidi_output, self.sources["testing"], + self.binaries["testing"]) - self.__log("Writing delta to %s" % self.options.heidi_delta_output) - write_heidi_delta(self.options.heidi_delta_output, - self.all_selected) + self.__log("Writing delta to %s" % self.options.heidi_delta_output) + write_heidi_delta(self.options.heidi_delta_output, + self.all_selected) self.printuninstchange()