Changeset 275624 in webkit

Timestamp:

Apr 7, 2021 2:00:24 PM (3 years ago)

Author:

aakash_jain@apple.com

Message:

commit-queue should perform git reset --hard between retry attempts
​https://bugs.webkit.org/show_bug.cgi?id=224300

Reviewed by Jonathan Bedard.

• CISupport/ews-build/steps.py:

(GitResetHard): Build step to perform git reset --hard.
(GitResetHard.start):
(PushCommitToWebKitRepo.evaluateCommand):

• CISupport/ews-build/steps_unittest.py: Added unit-test.

Location:

trunk/Tools

Files:

• CISupport/ews-build/steps.py (modified) (2 diffs)
• CISupport/ews-build/steps_unittest.py (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

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

@@ -167 +167 @@
     def start(self):
         self.setCommand(['git', 'checkout', self.getProperty('ews_revision')])
+        return shell.ShellCommand.start(self)
+
+
+class GitResetHard(shell.ShellCommand):
+    name = 'git-reset-hard'
+    descriptionDone = ['Performed git reset --hard']
+
+    def __init__(self, **kwargs):
+        super(GitResetHard, self).__init__(logEnviron=False, **kwargs)
+
+    def start(self):
+        self.setCommand(['git', 'reset', 'HEAD~10', '--hard'])
         return shell.ShellCommand.start(self)
 
@@ -3272 +3284 @@
             if retry_count < self.MAX_RETRY:
                 self.setProperty('retry_count', retry_count + 1)
-                self.build.addStepsAfterCurrentStep([CheckOutSource(), ShowIdentifier(), UpdateWorkingDirectory(), ApplyPatch(), CreateLocalGITCommit(), PushCommitToWebKitRepo()])
+                self.build.addStepsAfterCurrentStep([GitResetHard(), CheckOutSource(), ShowIdentifier(), UpdateWorkingDirectory(), ApplyPatch(), CreateLocalGITCommit(), PushCommitToWebKitRepo()])
                 return rc
 

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

@@ -47 +47 @@
                    CompileWebKitWithoutPatch, ConfigureBuild, CreateLocalGITCommit,
                    DownloadBuiltProduct, DownloadBuiltProductFromMaster, EWS_BUILD_HOSTNAME, ExtractBuiltProduct, ExtractTestResults,
-                   FetchBranches, FindModifiedChangeLogs, FindModifiedLayoutTests, InstallGtkDependencies, InstallWpeDependencies,
+                   FetchBranches, FindModifiedChangeLogs, FindModifiedLayoutTests, GitResetHard, InstallGtkDependencies, InstallWpeDependencies,
                    KillOldProcesses, PrintConfiguration, PushCommitToWebKitRepo, ReRunAPITests, ReRunJavaScriptCoreTests, ReRunWebKitPerlTests,
                    ReRunWebKitTests, RunAPITests, RunAPITestsWithoutPatch, RunBindingsTests, RunBuildWebKitOrgUnitTests,
@@ -837 +837 @@
         )
         self.expectOutcome(result=FAILURE, state_string='Failed to kill old processes')
+        return self.runStep()
+
+
+class TestGitResetHard(BuildStepMixinAdditions, unittest.TestCase):
+    def setUp(self):
+        self.longMessage = True
+        return self.setUpBuildStep()
+
+    def tearDown(self):
+        return self.tearDownBuildStep()
+
+    def test_success(self):
+        self.setupStep(GitResetHard())
+        self.expectRemoteCommands(
+            ExpectShell(workdir='wkdir',
+                        command=['git', 'reset', 'HEAD~10', '--hard'],
+                        logEnviron=False,
+                        )
+            + 0,
+        )
+        self.expectOutcome(result=SUCCESS, state_string='Performed git reset --hard')
+        return self.runStep()
+
+    def test_failure(self):
+        self.setupStep(GitResetHard())
+        self.expectRemoteCommands(
+            ExpectShell(workdir='wkdir',
+                        command=['git', 'reset', 'HEAD~10', '--hard'],
+                        logEnviron=False,
+                        )
+            + ExpectShell.log('stdio', stdout='Unexpected error.')
+            + 2,
+        )
+        self.expectOutcome(result=FAILURE, state_string='Performed git reset --hard (failure)')
         return self.runStep()
 

trunk/Tools/ChangeLog

@@ +1 @@
+2021-04-07  Aakash Jain  <aakash_jain@apple.com>
+
+        commit-queue should perform git reset --hard between retry attempts
+        https://bugs.webkit.org/show_bug.cgi?id=224300
+
+        Reviewed by Jonathan Bedard.
+
+        * CISupport/ews-build/steps.py:
+        (GitResetHard): Build step to perform git reset --hard.
+        (GitResetHard.start):
+        (PushCommitToWebKitRepo.evaluateCommand):
+        * CISupport/ews-build/steps_unittest.py: Added unit-test.
+
 2021-04-07  Jonathan Bedard  <jbedard@apple.com>