Changeset 295738 in webkit

Timestamp:

Jun 22, 2022, 11:02:36 AM (4 years ago)

Author:

Jonathan Bedard

Message:

[ews-build.webkit.org] Remove check-github-integrity (Part 1)
​https://bugs.webkit.org/show_bug.cgi?id=241859
<rdar://93108238>

Reviewed by Ryan Haddad.

• Tools/CISupport/ews-build/factories.py:

(CommitQueueFactory.init): Remove VerifyGitHubIntegrity.
(MergeQueueFactoryBase.init): Ditto.

• Tools/CISupport/ews-build/factories_unittest.py:

(TestExpectedBuildSteps):

• Tools/CISupport/ews-build/steps.py:

(VerifyGitHubIntegrity): Deleted.

• Tools/CISupport/ews-build/steps_unittest.py:

Canonical link: ​https://commits.webkit.org/251743@main

Location:

trunk/Tools/CISupport/ews-build

Files:

• factories.py (modified) (3 diffs)
• factories_unittest.py (modified) (3 diffs)
• steps.py (modified) (1 diff)
• steps_unittest.py (modified) (2 diffs)

trunk/Tools/CISupport/ews-build/factories.py

@@ -35 +35 @@
                    SetBuildSummary, ShowIdentifier, TriggerCrashLogSubmission, UpdateWorkingDirectory,
                    ValidateCommitMessage, ValidateChange, ValidateCommitterAndReviewer, WaitForCrashCollection,
-                   InstallBuiltProduct, VerifyGitHubIntegrity, ValidateSquashed)
+                   InstallBuiltProduct, ValidateSquashed)
 
 
@@ -298 +298 @@
         self.addStep(FetchBranches())
         self.addStep(ShowIdentifier())
-        self.addStep(VerifyGitHubIntegrity())
         self.addStep(UpdateWorkingDirectory())
         self.addStep(CommitPatch())
@@ -333 +332 @@
         self.addStep(FetchBranches())
         self.addStep(ShowIdentifier())
-        self.addStep(VerifyGitHubIntegrity())
         self.addStep(UpdateWorkingDirectory())
         self.addStep(CheckOutPullRequest())

trunk/Tools/CISupport/ews-build/factories_unittest.py

@@ -608 +608 @@
             'fetch-branch-references',
             'show-identifier',
-            'verify-github-integrity',
             'update-working-directory',
             'commit-patch',
@@ -637 +636 @@
             'fetch-branch-references',
             'show-identifier',
-            'verify-github-integrity',
             'update-working-directory',
             'checkout-pull-request',
@@ -663 +661 @@
             'fetch-branch-references',
             'show-identifier',
-            'verify-github-integrity',
             'update-working-directory',
             'checkout-pull-request',

trunk/Tools/CISupport/ews-build/steps.py

@@ -4709 +4709 @@
 
 
-# FIXME: Only needed when GitHub is a mirror, remove once GitHub is the source of truth
-class VerifyGitHubIntegrity(shell.ShellCommand):
-    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': 'GitHub integrity check failed'}
-        return {'step': 'Verified GitHub integrity'}
-
-    def evaluateCommand(self, cmd):
-        rc = shell.ShellCommand.evaluateCommand(self, cmd)
-        if rc != SUCCESS:
-            self.send_email_for_github_issue()
-        return rc
-
-    def send_email_for_github_issue(self):
-        try:
-            builder_name = self.getProperty('buildername', '')
-            build_url = '{}#/builders/{}/builds/{}'.format(self.master.config.buildbotURL, self.build._builderid, self.build.number)
-            email_subject = 'URGENT: GitHub integrity check failed'
-            email_text = 'URGENT issue on github repository. Integrity check failed.\n\nBuild: {}\n\nBuilder: {}'.format(build_url, builder_name)
-            send_email_to_github_admin(email_subject, email_text)
-        except Exception as e:
-            print('Error in sending email for github issue: {}'.format(e))
-
-
 class ValidateSquashed(shell.ShellCommand):
     name = 'validate-squashed'

trunk/Tools/CISupport/ews-build/steps_unittest.py

@@ -59 +59 @@
                    RunWebKitTestsWithoutChangeRedTree, AnalyzeLayoutTestsResultsRedTree, TestWithFailureCount, ShowIdentifier,
                    Trigger, TransferToS3, UnApplyPatch, UpdatePullRequest, UpdateWorkingDirectory, UploadBuiltProduct,
-                   UploadTestResults, ValidateCommitMessage, ValidateCommitterAndReviewer, ValidateChange,
-                   VerifyGitHubIntegrity, ValidateSquashed)
+                   UploadTestResults, ValidateCommitMessage, ValidateCommitterAndReviewer, ValidateChange, ValidateSquashed)
 
 # Workaround for https://github.com/buildbot/buildbot/issues/4669
@@ -5641 +5640 @@
 
 
-class TestVerifyGitHubIntegrity(BuildStepMixinAdditions, unittest.TestCase):
-    def setUp(self):
-        self.longMessage = True
-        return self.setUpBuildStep()
-
-    def tearDown(self):
-        return self.tearDownBuildStep()
-
-    def test_success(self):
-        self.setupStep(VerifyGitHubIntegrity())
-        self.expectRemoteCommands(
-            ExpectShell(workdir='wkdir',
-                        command=['python3', 'Tools/Scripts/check-github-mirror-integrity'],
-                        logEnviron=False,
-                        timeout=1200,
-                        )
-            + 0,
-        )
-        self.expectOutcome(result=SUCCESS, state_string='Verified GitHub integrity')
-        return self.runStep()
-
-    def test_failure(self):
-        self.setupStep(VerifyGitHubIntegrity())
-        self.expectRemoteCommands(
-            ExpectShell(workdir='wkdir',
-                        command=['python3', 'Tools/Scripts/check-github-mirror-integrity'],
-                        logEnviron=False,
-                        timeout=1200,
-                        )
-            + ExpectShell.log('stdio', stdout='Unexpected error.')
-            + 2,
-        )
-        self.expectOutcome(result=FAILURE, state_string='GitHub integrity check failed')
-        return self.runStep()
-
-
 class TestValidateSquashed(BuildStepMixinAdditions, unittest.TestCase):
     def setUp(self):