Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py (242197 => 242198)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py 2019-02-28 09:02:43 UTC (rev 242197)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/models/build.py 2019-02-28 12:28:34 UTC (rev 242198)
@@ -50,7 +50,7 @@
return str(self.build_id)
@classmethod
- def save_build(cls, patch_id, build_id, builder_id, number, result, state_string, started_at, complete_at=None):
+ def save_build(cls, patch_id, build_id, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at=None):
if not Build.is_valid_result(patch_id, build_id, builder_id, number, result, state_string, started_at, complete_at):
return ERR_UNEXPECTED
@@ -57,15 +57,15 @@
build = Build.get_existing_build(build_id)
if build:
# If the build data is already present in database, update it, e.g.: build complete event.
- return Build.update_build(build, patch_id, build_id, builder_id, number, result, state_string, started_at, complete_at)
+ return Build.update_build(build, patch_id, build_id, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at)
# Save the new build data, e.g.: build start event.
- Build(patch_id, build_id, builder_id, number, result, state_string, started_at, complete_at).save()
+ Build(patch_id, build_id, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at).save()
_log.info('Saved build {} in database for patch_id: {}'.format(build_id, patch_id))
return SUCCESS
@classmethod
- def update_build(cls, build, patch_id, build_id, builder_id, number, result, state_string, started_at, complete_at):
+ def update_build(cls, build, patch_id, build_id, builder_id, builder_name, builder_display_name, number, result, state_string, started_at, complete_at):
if build.patch_id != patch_id:
_log.error('patch_id {} does not match with patch_id {}. Ignoring new data.'.format(build.patch_id, patch_id))
return ERR_UNEXPECTED
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/views/results.py (242197 => 242198)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/views/results.py 2019-02-28 09:02:43 UTC (rev 242197)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/views/results.py 2019-02-28 12:28:34 UTC (rev 242198)
@@ -59,7 +59,8 @@
if not patch_id or patch_id < 1:
return HttpResponse("Invalid patch id: {}.".format(patch_id))
- Build.save_build(patch_id=int(patch_id), build_id=data['build_id'], builder_id=data['builder_id'], number=data['number'], result=data['result'],
+ Build.save_build(patch_id=int(patch_id), build_id=data['build_id'], builder_id=data['builder_id'], builder_name=data['builder_name'],
+ builder_display_name=data['builder_display_name'], number=data['number'], result=data['result'],
state_string=data['state_string'], started_at=data['started_at'], complete_at=data['complete_at'])
return HttpResponse("Saved data for patch: {}.\n".format(patch_id))
@@ -76,7 +77,8 @@
_log.error("Invalid data type: {}".format(data['type']))
return False
- required_keys = {u'ews-build': ['patch_id', 'build_id', 'builder_id', 'number', 'result', 'state_string', 'started_at', 'complete_at'],
+ required_keys = {u'ews-build': ['patch_id', 'build_id', 'builder_id', 'builder_name', 'builder_display_name',
+ 'number', 'result', 'state_string', 'started_at', 'complete_at'],
u'ews-step': ['step_id', 'build_id', 'result', 'state_string', 'started_at', 'complete_at']}
for key in required_keys.get(data.get('type')):
