Modified: trunk/Tools/CISupport/ews-build/steps.py (273089 => 273090)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-02-18 20:04:52 UTC (rev 273089)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-02-18 20:08:15 UTC (rev 273090)
@@ -940,9 +940,14 @@
def getResultSummary(self):
if self.results == SUCCESS:
return {u'step': u'Set cq- flag on patch'}
+ elif self.results == SKIPPED:
+ return buildstep.BuildStep.getResultSummary(self)
return {u'step': u'Failed to set cq- flag on patch'}
+ def doStepIf(self, step):
+ return CURRENT_HOSTNAME == EWS_BUILD_HOSTNAME
+
class RemoveFlagsOnPatch(buildstep.BuildStep, BugzillaMixin):
name = 'remove-flags-from-patch'
flunkOnFailure = False
@@ -1011,9 +1016,14 @@
def getResultSummary(self):
if self.results == SUCCESS:
return {u'step': u'Added comment on bug {}'.format(self.bug_id)}
+ elif self.results == SKIPPED:
+ return buildstep.BuildStep.getResultSummary(self)
return {u'step': u'Failed to add comment on bug {}'.format(self.bug_id)}
+ def doStepIf(self, step):
+ return CURRENT_HOSTNAME == EWS_BUILD_HOSTNAME
+
class UnApplyPatchIfRequired(CleanWorkingDirectory):
name = 'unapply-patch'
descriptionDone = ['Unapplied patch']
@@ -3131,7 +3141,10 @@
return {u'step': u'Failed to push commit to Webkit repository'}
return shell.ShellCommand.getResultSummary(self)
+ def doStepIf(self, step):
+ return CURRENT_HOSTNAME == EWS_BUILD_HOSTNAME
+
class CheckPatchStatusOnEWSQueues(buildstep.BuildStep, BugzillaMixin):
name = 'check-status-on-other-ewses'
descriptionDone = ['Checked patch status on other queues']
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (273089 => 273090)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-18 20:04:52 UTC (rev 273089)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-18 20:08:15 UTC (rev 273090)
@@ -43,7 +43,7 @@
CheckOutSource, CheckOutSpecificRevision, CheckPatchRelevance, CheckPatchStatusOnEWSQueues, CheckStyle,
CleanBuild, CleanUpGitIndexLock, CleanWorkingDirectory, CompileJSC, CompileJSCWithoutPatch, CompileWebKit,
CompileWebKitWithoutPatch, ConfigureBuild, CreateLocalGITCommit,
- DownloadBuiltProduct, DownloadBuiltProductFromMaster, ExtractBuiltProduct, ExtractTestResults,
+ DownloadBuiltProduct, DownloadBuiltProductFromMaster, EWS_BUILD_HOSTNAME, ExtractBuiltProduct, ExtractTestResults,
FindModifiedChangeLogs, InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses,
PrintConfiguration, PushCommitToWebKitRepo, ReRunAPITests, ReRunJavaScriptCoreTests, ReRunWebKitPerlTests,
ReRunWebKitTests, RunAPITests, RunAPITestsWithoutPatch, RunBindingsTests, RunBuildWebKitOrgUnitTests,
@@ -2743,7 +2743,6 @@
return self.tearDownBuildStep()
def test_success(self):
- import steps
self.setupStep(TransferToS3())
self.setProperty('fullPlatform', 'mac-highsierra')
self.setProperty('configuration', 'release')
@@ -2759,11 +2758,10 @@
+ 0,
)
self.expectOutcome(result=SUCCESS, state_string='Transferred archive to S3')
- with current_hostname(steps.EWS_BUILD_HOSTNAME):
+ with current_hostname(EWS_BUILD_HOSTNAME):
return self.runStep()
def test_failure(self):
- import steps
self.setupStep(TransferToS3())
self.setProperty('fullPlatform', 'ios-simulator-12')
self.setProperty('configuration', 'debug')
@@ -2779,7 +2777,7 @@
+ 2,
)
self.expectOutcome(result=FAILURE, state_string='Failed to transfer archive to S3')
- with current_hostname(steps.EWS_BUILD_HOSTNAME):
+ with current_hostname(EWS_BUILD_HOSTNAME):
return self.runStep()
def test_skipped(self):
@@ -3775,7 +3773,8 @@
0,
)
self.expectOutcome(result=SUCCESS, state_string='Committed r256729')
- rc = self.runStep()
+ with current_hostname(EWS_BUILD_HOSTNAME):
+ rc = self.runStep()
self.assertEqual(self.getProperty('bugzilla_comment_text'), 'Committed r256729: <https://commits.webkit.org/r256729>\n\nAll reviewed patches have been landed. Closing bug and clearing flags on attachment 1234.')
self.assertEqual(self.getProperty('build_finish_summary'), None)
return rc
@@ -3792,7 +3791,8 @@
2,
)
self.expectOutcome(result=FAILURE, state_string='Failed to push commit to Webkit repository')
- rc = self.runStep()
+ with current_hostname(EWS_BUILD_HOSTNAME):
+ rc = self.runStep()
self.assertEqual(self.getProperty('retry_count'), 1)
self.assertEqual(self.getProperty('build_finish_summary'), None)
self.assertEqual(self.getProperty('bugzilla_comment_text'), None)
@@ -3811,7 +3811,8 @@
2,
)
self.expectOutcome(result=FAILURE, state_string='Failed to push commit to Webkit repository')
- rc = self.runStep()
+ with current_hostname(EWS_BUILD_HOSTNAME):
+ rc = self.runStep()
self.assertEqual(self.getProperty('build_finish_summary'), 'Failed to commit to WebKit repository')
self.assertEqual(self.getProperty('bugzilla_comment_text'), 'commit-queue failed to commit attachment 2345 to WebKit repository. To retry, please set cq+ flag again.')
return rc
