From 8d5025809c1d9bb9c52bc62f2be7f0c4686ef197 Mon Sep 17 00:00:00 2001 From: Simon Westphahl Date: Thu, 16 Jan 2020 11:27:15 +0100 Subject: [PATCH] Report buildset result in MQTT reporter Change-Id: I9682caf98af870677e92a17fc822e0c570cea8df --- doc/source/reference/drivers/mqtt.rst | 4 ++++ tests/unit/test_connection.py | 2 ++ zuul/driver/mqtt/mqttreporter.py | 1 + 3 files changed, 7 insertions(+) diff --git a/doc/source/reference/drivers/mqtt.rst b/doc/source/reference/drivers/mqtt.rst index afe4062d86..b4a7068d04 100644 --- a/doc/source/reference/drivers/mqtt.rst +++ b/doc/source/reference/drivers/mqtt.rst @@ -66,6 +66,10 @@ An MQTT report uses this schema: The buildset global uuid. + .. attr:: result + + The buildset result + .. attr:: builds The list of builds. diff --git a/tests/unit/test_connection.py b/tests/unit/test_connection.py index 03163e8d75..cb80a032a2 100644 --- a/tests/unit/test_connection.py +++ b/tests/unit/test_connection.py @@ -472,6 +472,7 @@ class TestMQTTConnection(ZuulTestCase): mqtt_payload = start_event['msg'] self.assertEquals(mqtt_payload['project'], 'org/project') self.assertEquals(mqtt_payload['branch'], 'master') + self.assertEquals(mqtt_payload['buildset']['result'], None) self.assertEquals(mqtt_payload['buildset']['builds'][0]['job_name'], 'test') self.assertNotIn('result', mqtt_payload['buildset']['builds'][0]) @@ -481,6 +482,7 @@ class TestMQTTConnection(ZuulTestCase): mqtt_payload = success_event['msg'] self.assertEquals(mqtt_payload['project'], 'org/project') self.assertEquals(mqtt_payload['branch'], 'master') + self.assertEquals(mqtt_payload['buildset']['result'], 'SUCCESS') builds = mqtt_payload['buildset']['builds'] test_job = [b for b in builds if b['job_name'] == 'test'][0] dependent_test_job = [ diff --git a/zuul/driver/mqtt/mqttreporter.py b/zuul/driver/mqtt/mqttreporter.py index fd7f6d30fa..3ef2be58e3 100644 --- a/zuul/driver/mqtt/mqttreporter.py +++ b/zuul/driver/mqtt/mqttreporter.py @@ -47,6 +47,7 @@ class MQTTReporter(BaseReporter): 'enqueue_time': item.enqueue_time, 'buildset': { 'uuid': item.current_build_set.uuid, + 'result': item.current_build_set.result, 'builds': [] }, 'zuul_event_id': item.event.zuul_event_id,