Modified: trunk/Tools/CISupport/ews-build/factories_unittest.py (276314 => 276315)
--- trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-04-20 18:38:48 UTC (rev 276314)
+++ trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-04-20 19:29:40 UTC (rev 276315)
@@ -414,7 +414,7 @@
_BuildStepFactory(steps.ValidateCommiterAndReviewer),
_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),
_BuildStepFactory(steps.UpdateWorkingDirectory),
@@ -428,7 +428,7 @@
_BuildStepFactory(steps.CheckPatchStatusOnEWSQueues),
_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),
_BuildStepFactory(steps.ApplyPatch),
Modified: trunk/Tools/CISupport/ews-build/steps.py (276314 => 276315)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-04-20 18:38:48 UTC (rev 276314)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-04-20 19:29:40 UTC (rev 276315)
@@ -109,9 +109,8 @@
CHECKOUT_DELAY_AND_MAX_RETRIES_PAIR = (0, 2)
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,
alwaysUseLatest=True,
@@ -222,6 +221,8 @@
match = re.search(self.identifier_re, log_text, re.MULTILINE)
if match:
identifier = match.group(1)
+ if identifier:
+ identifier = identifier.replace('master', 'main')
self.setProperty('identifier', identifier)
ews_revision = self.getProperty('ews_revision')
if ews_revision:
@@ -3139,9 +3140,9 @@
# git situations we've gotten ourself into in the past.
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):
self.commands = []
@@ -3322,7 +3323,7 @@
retry_count = int(self.getProperty('retry_count', 0))
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
self.setProperty('bugzilla_comment_text', self.comment_text_for_bug())
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (276314 => 276315)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-04-20 18:38:48 UTC (rev 276314)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-04-20 19:29:40 UTC (rev 276315)
@@ -3906,12 +3906,12 @@
+ ExpectShell.log('stdio', stdout=''),
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')
return self.runStep()
@@ -3925,12 +3925,12 @@
+ ExpectShell.log('stdio', stdout=''),
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')
return self.runStep()
