Modified: trunk/Tools/CISupport/ews-build/events.py (288713 => 288714)
--- trunk/Tools/CISupport/ews-build/events.py 2022-01-28 00:53:49 UTC (rev 288713)
+++ trunk/Tools/CISupport/ews-build/events.py 2022-01-28 00:58:30 UTC (rev 288714)
@@ -160,8 +160,7 @@
self.sendDataToEWS(data)
- @defer.inlineCallbacks
- def buildFinishedGitHub(self, context, build):
+ def buildFinishedGitHub(self, build):
sha = self.extractProperty(build, 'github.head.sha')
repository = self.extractProperty(build, 'repository')
@@ -183,7 +182,7 @@
FAILURE: 'failure'
}.get(build.get('results'), 'error'),
description=build.get('state_string'),
- context=context,
+ context=build['description'] + custom_suffix,
)
self.sendDataToGitHub(repository, sha, data_to_send)
@@ -195,10 +194,10 @@
build['steps'] = yield self.master.db.steps.getSteps(build.get('buildid'))
builder = yield self.master.db.builders.getBuilder(build.get('builderid'))
- builder_display_name = builder.get('description')
+ build['description'] = builder.get('description', '?')
if self.extractProperty(build, 'github.number'):
- return self.buildFinishedGitHub(builder_display_name, build)
+ return self.buildFinishedGitHub(build)
patch_id = self.extractProperty(build, 'patch_id')
if not patch_id:
@@ -217,7 +216,7 @@
"complete_at": build.get('complete_at'),
"state_string": build.get('state_string'),
"builder_name": self.getBuilderName(build),
- "builder_display_name": builder_display_name,
+ "builder_display_name": builder.get('description'),
"steps": build.get('steps'),
}
@@ -246,7 +245,7 @@
EXCEPTION: 'error',
}.get(build.get('results'), 'pending'),
description=state_string,
- context=builder.get('description'),
+ context=builder.get('description', '?') + custom_suffix,
)
self.sendDataToGitHub(repository, sha, data_to_send)
Modified: trunk/Tools/ChangeLog (288713 => 288714)
--- trunk/Tools/ChangeLog 2022-01-28 00:53:49 UTC (rev 288713)
+++ trunk/Tools/ChangeLog 2022-01-28 00:58:30 UTC (rev 288714)
@@ -1,3 +1,15 @@
+2022-01-26 Jonathan Bedard <jbed...@apple.com>
+
+ [EWS] Differentiate UAT and production PR processing
+ https://bugs.webkit.org/show_bug.cgi?id=235669
+ <rdar://problem/88093065>
+
+ Reviewed by Aakash Jain.
+
+ * CISupport/ews-build/events.py:
+ (Events.buildFinished): Append custom_suffix to reported context.
+ (Events.stepStartedGitHub): Ditto.
+
2022-01-27 Jonathan Bedard <jbed...@apple.com>
[EWS] Ignore hooks from closed PRs
