Changeset 276315 in webkit

Timestamp:

Apr 20, 2021, 12:29:40 PM (4 years ago)

Author:

aakash_jain@apple.com

Message:

Switch commit-queue back to git.webkit.org
​https://bugs.webkit.org/show_bug.cgi?id=224762

Reviewed by Jonathan Bedard.

• CISupport/ews-build/factories.py:

(CommitQueueFactory.init): Use git.webkit.org for Commit-Queue.

• CISupport/ews-build/factories_unittest.py:

(TestCommitQueueFactory.test_commit_queue_factory): Updated unit-tests.

• CISupport/ews-build/steps.py:

(CheckOutSource.init):
(PushCommitToWebKitRepo.evaluateCommand):

Location:

trunk/Tools

Files:

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

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

@@ -283 +283 @@
         self.addStep(PrintConfiguration())
         self.addStep(CleanGitRepo())
-        self.addStep(CheckOutSource())
+        self.addStep(CheckOutSource(repourl='https://git.webkit.org/git/WebKit-https'))
         self.addStep(FetchBranches())
         self.addStep(ShowIdentifier())
@@ -297 +297 @@
         self.addStep(RunWebKitTests())
         self.addStep(ValidatePatch(addURLs=False, verifycqplus=True))
-        self.addStep(CheckOutSource())
+        self.addStep(CheckOutSource(repourl='https://git.webkit.org/git/WebKit-https'))
         self.addStep(ShowIdentifier())
         self.addStep(UpdateWorkingDirectory())

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

@@ -415 +415 @@
             _BuildStepFactory(steps.PrintConfiguration),
             _BuildStepFactory(steps.CleanGitRepo),
-            _BuildStepFactory(steps.CheckOutSource),
+            _BuildStepFactory(steps.CheckOutSource, repourl='https://git.webkit.org/git/WebKit-https'),
             _BuildStepFactory(steps.FetchBranches),
             _BuildStepFactory(steps.ShowIdentifier),
@@ -429 +429 @@
             _BuildStepFactory(steps.RunWebKitTests),
             _BuildStepFactory(steps.ValidatePatch, addURLs=False, verifycqplus=True),
-            _BuildStepFactory(steps.CheckOutSource),
+            _BuildStepFactory(steps.CheckOutSource, repourl='https://git.webkit.org/git/WebKit-https'),
             _BuildStepFactory(steps.ShowIdentifier),
             _BuildStepFactory(steps.UpdateWorkingDirectory),

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

@@ -110 +110 @@
     haltOnFailure = False
 
-    def __init__(self, **kwargs):
-        self.repourl = 'https://github.com/WebKit/WebKit.git'
-        super(CheckOutSource, self).__init__(repourl=self.repourl,
+    def __init__(self, repourl='https://github.com/WebKit/WebKit.git', **kwargs):
+        super(CheckOutSource, self).__init__(repourl=repourl,
                                                 retry=self.CHECKOUT_DELAY_AND_MAX_RETRIES_PAIR,
                                                 timeout=2 * 60 * 60,
@@ -223 +222 @@
         if match:
             identifier = match.group(1)
+            if identifier:
+                identifier = identifier.replace('master', 'main')
             self.setProperty('identifier', identifier)
             ews_revision = self.getProperty('ews_revision')
@@ -3140 +3141 @@
     command_list = [['git', 'clean', '-f', '-d'],  # Remove any left-over layout test results, added files, etc.
                     ['git', 'fetch', 'origin'],  # Avoid updating the working copy to a stale revision.
-                    ['git', 'checkout', 'origin/main', '-f'],
-                    ['git', 'branch', '-D', 'main'],
-                    ['git', 'checkout', 'origin/main', '-b', 'main']]
+                    ['git', 'checkout', 'origin/master', '-f'],
+                    ['git', 'branch', '-D', 'master'],
+                    ['git', 'checkout', 'origin/master', '-b', 'master']]
 
     def run(self):
@@ -3323 +3324 @@
             if retry_count < self.MAX_RETRY:
                 self.setProperty('retry_count', retry_count + 1)
-                self.build.addStepsAfterCurrentStep([GitResetHard(), CheckOutSource(), ShowIdentifier(), UpdateWorkingDirectory(), ApplyPatch(), CreateLocalGITCommit(), PushCommitToWebKitRepo()])
+                self.build.addStepsAfterCurrentStep([GitResetHard(), CheckOutSource(repourl='https://git.webkit.org/git/WebKit-https'), ShowIdentifier(), UpdateWorkingDirectory(), ApplyPatch(), CreateLocalGITCommit(), PushCommitToWebKitRepo()])
                 return rc
 

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

@@ -3907 +3907 @@
             ExpectShell(command=['git', 'fetch', 'origin'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
             + ExpectShell.log('stdio', stdout=''),
-            ExpectShell(command=['git', 'checkout', 'origin/main', '-f'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+            ExpectShell(command=['git', 'checkout', 'origin/master', '-f'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
             + ExpectShell.log('stdio', stdout='You are in detached HEAD state.'),
-            ExpectShell(command=['git', 'branch', '-D', 'main'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
-            + ExpectShell.log('stdio', stdout='Deleted branch main (was 57015967fef9).'),
-            ExpectShell(command=['git', 'checkout', 'origin/main', '-b', 'main'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
-            + ExpectShell.log('stdio', stdout="Switched to a new branch 'main'"),
+            ExpectShell(command=['git', 'branch', '-D', 'master'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+            + ExpectShell.log('stdio', stdout='Deleted branch master (was 57015967fef9).'),
+            ExpectShell(command=['git', 'checkout', 'origin/master', '-b', 'master'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+            + ExpectShell.log('stdio', stdout="Switched to a new branch 'master'"),
         )
         self.expectOutcome(result=SUCCESS, state_string='Cleaned up git repository')
@@ -3926 +3926 @@
             ExpectShell(command=['git', 'fetch', 'origin'], workdir='wkdir', timeout=1200, logEnviron=False) + 128
             + ExpectShell.log('stdio', stdout='fatal: unable to access https://github.com/WebKit/WebKit.git/: Could not resolve host: github.com'),
-            ExpectShell(command=['git', 'checkout', 'origin/main', '-f'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+            ExpectShell(command=['git', 'checkout', 'origin/master', '-f'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
             + ExpectShell.log('stdio', stdout='You are in detached HEAD state.'),
-            ExpectShell(command=['git', 'branch', '-D', 'main'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
-            + ExpectShell.log('stdio', stdout='Deleted branch main (was 57015967fef9).'),
-            ExpectShell(command=['git', 'checkout', 'origin/main', '-b', 'main'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
-            + ExpectShell.log('stdio', stdout="Switched to a new branch 'main'"),
+            ExpectShell(command=['git', 'branch', '-D', 'master'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+            + ExpectShell.log('stdio', stdout='Deleted branch master (was 57015967fef9).'),
+            ExpectShell(command=['git', 'checkout', 'origin/master', '-b', 'master'], workdir='wkdir', timeout=1200, logEnviron=False) + 0
+            + ExpectShell.log('stdio', stdout="Switched to a new branch 'master'"),
         )
         self.expectOutcome(result=FAILURE, state_string='Encountered some issues during cleanup')

trunk/Tools/ChangeLog

@@ +1 @@
+2021-04-20  Aakash Jain  <aakash_jain@apple.com>
+
+        Switch commit-queue back to git.webkit.org
+        https://bugs.webkit.org/show_bug.cgi?id=224762
+
+        Reviewed by Jonathan Bedard.
+
+        * CISupport/ews-build/factories.py:
+        (CommitQueueFactory.__init__): Use git.webkit.org for Commit-Queue.
+        * CISupport/ews-build/factories_unittest.py:
+        (TestCommitQueueFactory.test_commit_queue_factory): Updated unit-tests.
+        * CISupport/ews-build/steps.py:
+        (CheckOutSource.__init__):
+        (PushCommitToWebKitRepo.evaluateCommand):
+
 2021-04-20  Alex Christensen  <achristensen@webkit.org>