- Revision
- 280399
- Author
- jbed...@apple.com
- Date
- 2021-07-28 14:36:26 -0700 (Wed, 28 Jul 2021)
Log Message
[ews-build.webkit.org] Verify GitHub integrity in commit queue
https://bugs.webkit.org/show_bug.cgi?id=228563
<rdar://problem/81230685>
Reviewed by Aakash Jain.
* CISupport/ews-build/factories.py:
(CommitQueueFactory.__init__): Add VerifyGitHubIntegrity.
* CISupport/ews-build/factories_unittest.py:
(TestCommitQueueFactory.test_commit_queue_factory):
* CISupport/ews-build/steps.py:
(CheckPatchStatusOnEWSQueues.start):
(VerifyGitHubIntegrity):
(VerifyGitHubIntegrity.__init__):
(VerifyGitHubIntegrity.getResultSummary):
* Scripts/check-github-mirror-integrity: Import webkitscmpy from webkitpy.
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/factories.py (280398 => 280399)
--- trunk/Tools/CISupport/ews-build/factories.py 2021-07-28 20:21:30 UTC (rev 280398)
+++ trunk/Tools/CISupport/ews-build/factories.py 2021-07-28 21:36:26 UTC (rev 280399)
@@ -33,7 +33,7 @@
RunWebKitPyPython3Tests, RunWebKitTests, RunWebKitTestsInStressMode, RunWebKitTestsInStressGuardmallocMode,
SetBuildSummary, ShowIdentifier, TriggerCrashLogSubmission, UpdateWorkingDirectory,
ValidatePatch, ValidateChangeLogAndReviewer, ValidateCommiterAndReviewer, WaitForCrashCollection,
- InstallBuiltProduct)
+ InstallBuiltProduct, VerifyGitHubIntegrity)
class Factory(factory.BuildFactory):
@@ -289,6 +289,7 @@
self.addStep(CheckOutSource(repourl='https://git.webkit.org/git/WebKit-https'))
self.addStep(FetchBranches())
self.addStep(ShowIdentifier())
+ self.addStep(VerifyGitHubIntegrity())
self.addStep(UpdateWorkingDirectory())
self.addStep(ApplyPatch())
self.addStep(ValidateChangeLogAndReviewer())
Modified: trunk/Tools/CISupport/ews-build/factories_unittest.py (280398 => 280399)
--- trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-07-28 20:21:30 UTC (rev 280398)
+++ trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-07-28 21:36:26 UTC (rev 280399)
@@ -418,6 +418,7 @@
_BuildStepFactory(steps.CheckOutSource, repourl='https://git.webkit.org/git/WebKit-https'),
_BuildStepFactory(steps.FetchBranches),
_BuildStepFactory(steps.ShowIdentifier),
+ _BuildStepFactory(steps.VerifyGitHubIntegrity),
_BuildStepFactory(steps.UpdateWorkingDirectory),
_BuildStepFactory(steps.ApplyPatch),
_BuildStepFactory(steps.ValidateChangeLogAndReviewer),
Modified: trunk/Tools/CISupport/ews-build/steps.py (280398 => 280399)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-07-28 20:21:30 UTC (rev 280398)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-07-28 21:36:26 UTC (rev 280399)
@@ -3449,3 +3449,18 @@
self.setProperty('passed_mac_wk2', True)
self.finished(SUCCESS)
return None
+
+
+# FIXME: Only needed when GitHub is a mirror, remove once GitHub is the source of truth
+class VerifyGitHubIntegrity(steps.ShellSequence):
+ command = ['python3', 'Tools/Scripts/check-github-mirror-integrity']
+ name = 'verify-github-integrity'
+ haltOnFailure = True
+
+ def __init__(self, **kwargs):
+ super(VerifyGitHubIntegrity, self).__init__(logEnviron=False, **kwargs)
+
+ def getResultSummary(self):
+ if self.results != SUCCESS:
+ return {'step': 'Encountered some issues during cleanup'}
+ return {'step': 'Verified GitHub integrity'}
Modified: trunk/Tools/ChangeLog (280398 => 280399)
--- trunk/Tools/ChangeLog 2021-07-28 20:21:30 UTC (rev 280398)
+++ trunk/Tools/ChangeLog 2021-07-28 21:36:26 UTC (rev 280399)
@@ -1,3 +1,22 @@
+2021-07-28 Jonathan Bedard <jbed...@apple.com>
+
+ [ews-build.webkit.org] Verify GitHub integrity in commit queue
+ https://bugs.webkit.org/show_bug.cgi?id=228563
+ <rdar://problem/81230685>
+
+ Reviewed by Aakash Jain.
+
+ * CISupport/ews-build/factories.py:
+ (CommitQueueFactory.__init__): Add VerifyGitHubIntegrity.
+ * CISupport/ews-build/factories_unittest.py:
+ (TestCommitQueueFactory.test_commit_queue_factory):
+ * CISupport/ews-build/steps.py:
+ (CheckPatchStatusOnEWSQueues.start):
+ (VerifyGitHubIntegrity):
+ (VerifyGitHubIntegrity.__init__):
+ (VerifyGitHubIntegrity.getResultSummary):
+ * Scripts/check-github-mirror-integrity: Import webkitscmpy from webkitpy.
+
2021-07-28 Alex Christensen <achristen...@webkit.org>
WebSocket: Safari on iOS 15 beta 3 is sending invalid close frame
Modified: trunk/Tools/Scripts/check-github-mirror-integrity (280398 => 280399)
--- trunk/Tools/Scripts/check-github-mirror-integrity 2021-07-28 20:21:30 UTC (rev 280398)
+++ trunk/Tools/Scripts/check-github-mirror-integrity 2021-07-28 21:36:26 UTC (rev 280399)
@@ -25,6 +25,7 @@
import os
import sys
+from webkitpy import webkitscmpy
from webkitscmpy import remote
