diff --git a/buildbot_nix/__init__.py b/buildbot_nix/__init__.py index cd620ae..e09bb0b 100644 --- a/buildbot_nix/__init__.py +++ b/buildbot_nix/__init__.py @@ -900,7 +900,10 @@ def gerritReviewFmt(url: str, payload: CallbackPayloadBuild | CallbackPayloadBui if result == util.RETRY: return CallbackReturn() - if builderName != f'{build["properties"].get("event.project")}/nix-eval': + expectedBuilderName = f'{build["properties"].get("event.project")}/nix-eval' + + if builderName != expectedBuilderName: + log.info("Passing {} builder which is not of the form '{}'".format(builderName, expectedBuilderName)) return CallbackReturn() failed = build['properties'].get('failed_builds', [[]])[0] @@ -925,6 +928,7 @@ def gerritReviewFmt(url: str, payload: CallbackPayloadBuild | CallbackPayloadBui message += "\nFor more details visit:\n" message += build['url'] + "\n" + log.info("Message formatted: {}, labels: Verified={}".format(message, labels['Verified'])) return CallbackReturn(body=message, extra_info={'labels': labels}) class GerritNixConfigurator(ConfiguratorBase): @@ -1028,7 +1032,7 @@ class GerritNixConfigurator(ConfiguratorBase): identity_file=self.gerrit_sshkey_path, generators=[ BuildStatusGenerator( - mode=['cancelled', 'failing', 'passing', 'problem', 'exception'], + mode=['all'], message_formatter=ReasonableMessageFormatter( lambda data: gerritReviewFmt(self.url, data), "plain",