Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps.py (242968 => 242969)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-03-14 22:07:07 UTC (rev 242968)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps.py 2019-03-14 22:08:53 UTC (rev 242969)
@@ -40,7 +40,7 @@
class ConfigureBuild(buildstep.BuildStep):
name = "configure-build"
description = ["configuring build"]
- descriptionDone = ["configured build"]
+ descriptionDone = ["Configured build"]
def __init__(self, platform, configuration, architectures, buildOnly, additionalArguments):
super(ConfigureBuild, self).__init__()
@@ -99,7 +99,7 @@
class CleanWorkingDirectory(shell.ShellCommand):
name = 'clean-working-directory'
description = ['clean-working-directory running']
- descriptionDone = ['clean-working-directory']
+ descriptionDone = ['Cleaned working directory']
flunkOnFailure = True
haltOnFailure = True
command = ['Tools/Scripts/clean-webkit']
@@ -108,7 +108,7 @@
class ApplyPatch(shell.ShellCommand, CompositeStepMixin):
name = 'apply-patch'
description = ['applying-patch']
- descriptionDone = ['apply-patch']
+ descriptionDone = ['Applied patch']
flunkOnFailure = True
haltOnFailure = True
command = ['Tools/Scripts/svn-apply', '--force', '.buildbot-diff']
@@ -133,7 +133,7 @@
class CheckPatchRelevance(buildstep.BuildStep):
name = 'check-patch-relevance'
description = ['check-patch-relevance running']
- descriptionDone = ['check-patch-relevance']
+ descriptionDone = ['Checked patch relevance']
flunkOnFailure = True
haltOnFailure = True
@@ -224,7 +224,7 @@
class ValidatePatch(buildstep.BuildStep):
name = 'validate-patch'
description = ['validate-patch running']
- descriptionDone = ['validate-patch']
+ descriptionDone = ['Validated patch']
flunkOnFailure = True
haltOnFailure = True
bug_open_statuses = ["UNCONFIRMED", "NEW", "ASSIGNED", "REOPENED"]
@@ -362,6 +362,7 @@
class UnApplyPatchIfRequired(CleanWorkingDirectory):
name = 'unapply-patch'
+ descriptionDone = ['Unapplied patch']
def doStepIf(self, step):
return self.getProperty('patchFailedToBuild') or self.getProperty('patchFailedJSCTests')
@@ -473,7 +474,7 @@
class CompileWebKit(shell.Compile):
name = "compile-webkit"
description = ["compiling"]
- descriptionDone = ["compiled"]
+ descriptionDone = ["Compiled WebKit"]
env = {'MFLAGS': ''}
warningPattern = ".*arning: .*"
haltOnFailure = False
@@ -522,6 +523,7 @@
class CompileJSCOnly(CompileWebKit):
name = "build-jsc"
+ descriptionDone = ["Compiled JSC"]
command = ["perl", "Tools/Scripts/build-jsc", WithProperties("--%(configuration)s")]
@@ -584,7 +586,7 @@
class CleanBuild(shell.Compile):
name = "delete-WebKitBuild-directory"
description = ["deleting WebKitBuild directory"]
- descriptionDone = ["deleted WebKitBuild directory"]
+ descriptionDone = ["Deleted WebKitBuild directory"]
command = ["python", "Tools/BuildSlaveSupport/clean-build", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
@@ -591,7 +593,7 @@
class KillOldProcesses(shell.Compile):
name = "kill-old-processes"
description = ["killing old processes"]
- descriptionDone = ["killed old processes"]
+ descriptionDone = ["Killed old processes"]
command = ["python", "Tools/BuildSlaveSupport/kill-old-processes", "buildbot"]
def __init__(self, **kwargs):
@@ -636,7 +638,7 @@
WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s'), 'archive']
name = 'archive-built-product'
description = ['archiving built product']
- descriptionDone = ['archived built product']
+ descriptionDone = ['Archived built product']
haltOnFailure = True
@@ -660,7 +662,7 @@
WithProperties(EWS_URL + 'archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')]
name = 'download-built-product'
description = ['downloading built product']
- descriptionDone = ['downloaded built product']
+ descriptionDone = ['Downloaded built product']
haltOnFailure = True
flunkOnFailure = True
@@ -670,7 +672,7 @@
WithProperties('--platform=%(fullPlatform)s'), WithProperties('--%(configuration)s'), 'extract']
name = 'extract-built-product'
description = ['extracting built product']
- descriptionDone = ['extracted built product']
+ descriptionDone = ['Extracted built product']
haltOnFailure = True
flunkOnFailure = True
@@ -703,12 +705,13 @@
Interpolate('--platform=%(prop:platform)s'), Interpolate('--%(prop:configuration)s'), 'archive']
name = 'archive-test-results'
description = ['archiving test results']
- descriptionDone = ['archived test results']
+ descriptionDone = ['Archived test results']
haltOnFailure = True
class UploadTestResults(transfer.FileUpload):
name = 'upload-test-results'
+ descriptionDone = ['Uploaded test results']
workersrc = 'layout-test-results.zip'
masterdest = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:patch_id)s-%(prop:buildnumber)s.zip')
haltOnFailure = True
@@ -726,7 +729,7 @@
zipFile = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:patch_id)s-%(prop:buildnumber)s.zip')
resultDirectory = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:patch_id)s-%(prop:buildnumber)s')
- descriptionDone = ['uploaded results']
+ descriptionDone = ['Extracted test results']
command = ['unzip', zipFile, '-d', resultDirectory]
renderables = ['resultDirectory']
Modified: trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py (242968 => 242969)
--- trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-03-14 22:07:07 UTC (rev 242968)
+++ trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py 2019-03-14 22:08:53 UTC (rev 242969)
@@ -397,7 +397,7 @@
)
+ 0,
)
- self.expectOutcome(result=SUCCESS, state_string='killed old processes')
+ self.expectOutcome(result=SUCCESS, state_string='Killed old processes')
return self.runStep()
def test_failure(self):
@@ -410,7 +410,7 @@
+ ExpectShell.log('stdio', stdout='Unexpected error.')
+ 2,
)
- self.expectOutcome(result=FAILURE, state_string='killed old processes (failure)')
+ self.expectOutcome(result=FAILURE, state_string='Killed old processes (failure)')
return self.runStep()
@@ -432,7 +432,7 @@
)
+ 0,
)
- self.expectOutcome(result=SUCCESS, state_string='deleted WebKitBuild directory')
+ self.expectOutcome(result=SUCCESS, state_string='Deleted WebKitBuild directory')
return self.runStep()
def test_failure(self):
@@ -446,7 +446,7 @@
+ ExpectShell.log('stdio', stdout='Unexpected error.')
+ 2,
)
- self.expectOutcome(result=FAILURE, state_string='deleted WebKitBuild directory (failure)')
+ self.expectOutcome(result=FAILURE, state_string='Deleted WebKitBuild directory (failure)')
return self.runStep()
@@ -468,7 +468,7 @@
)
+ 0,
)
- self.expectOutcome(result=SUCCESS, state_string='compiled')
+ self.expectOutcome(result=SUCCESS, state_string='Compiled WebKit')
return self.runStep()
def test_failure(self):
@@ -482,7 +482,7 @@
+ ExpectShell.log('stdio', stdout='1 error generated.')
+ 2,
)
- self.expectOutcome(result=FAILURE, state_string='compiled (failure)')
+ self.expectOutcome(result=FAILURE, state_string='Compiled WebKit (failure)')
return self.runStep()
@@ -505,7 +505,7 @@
)
+ 0,
)
- self.expectOutcome(result=SUCCESS, state_string='compiled')
+ self.expectOutcome(result=SUCCESS, state_string='Compiled WebKit')
return self.runStep()
def test_failure(self):
@@ -520,7 +520,7 @@
+ ExpectShell.log('stdio', stdout='1 error generated.')
+ 2,
)
- self.expectOutcome(result=FAILURE, state_string='compiled (failure)')
+ self.expectOutcome(result=FAILURE, state_string='Compiled WebKit (failure)')
return self.runStep()
def test_skip(self):
@@ -528,7 +528,7 @@
self.setProperty('fullPlatform', 'ios-simulator-11')
self.setProperty('configuration', 'release')
self.expectHidden(True)
- self.expectOutcome(result=SKIPPED, state_string='compiled (skipped)')
+ self.expectOutcome(result=SKIPPED, state_string='Compiled WebKit (skipped)')
return self.runStep()
@@ -550,7 +550,7 @@
)
+ 0,
)
- self.expectOutcome(result=SUCCESS, state_string='compiled')
+ self.expectOutcome(result=SUCCESS, state_string='Compiled JSC')
return self.runStep()
def test_failure(self):
@@ -564,7 +564,7 @@
+ ExpectShell.log('stdio', stdout='1 error generated.')
+ 2,
)
- self.expectOutcome(result=FAILURE, state_string='compiled (failure)')
+ self.expectOutcome(result=FAILURE, state_string='Compiled JSC (failure)')
return self.runStep()
@@ -587,7 +587,7 @@
)
+ 0,
)
- self.expectOutcome(result=SUCCESS, state_string='compiled')
+ self.expectOutcome(result=SUCCESS, state_string='Compiled JSC')
return self.runStep()
def test_failure(self):
@@ -602,7 +602,7 @@
+ ExpectShell.log('stdio', stdout='1 error generated.')
+ 2,
)
- self.expectOutcome(result=FAILURE, state_string='compiled (failure)')
+ self.expectOutcome(result=FAILURE, state_string='Compiled JSC (failure)')
return self.runStep()
def test_skip(self):
@@ -610,7 +610,7 @@
self.setProperty('fullPlatform', 'jsc-only')
self.setProperty('configuration', 'debug')
self.expectHidden(True)
- self.expectOutcome(result=SKIPPED, state_string='compiled (skipped)')
+ self.expectOutcome(result=SKIPPED, state_string='Compiled JSC (skipped)')
return self.runStep()
@@ -841,7 +841,7 @@
)
+ 0,
)
- self.expectOutcome(result=SUCCESS, state_string='archived built product')
+ self.expectOutcome(result=SUCCESS, state_string='Archived built product')
return self.runStep()
def test_failure(self):
@@ -855,7 +855,7 @@
+ ExpectShell.log('stdio', stdout='Unexpected failure.')
+ 2,
)
- self.expectOutcome(result=FAILURE, state_string='archived built product (failure)')
+ self.expectOutcome(result=FAILURE, state_string='Archived built product (failure)')
return self.runStep()
@@ -907,7 +907,7 @@
)
+ 0,
)
- self.expectOutcome(result=SUCCESS, state_string='extracted built product')
+ self.expectOutcome(result=SUCCESS, state_string='Extracted built product')
return self.runStep()
def test_failure(self):
@@ -921,7 +921,7 @@
+ ExpectShell.log('stdio', stdout='Unexpected failure.')
+ 2,
)
- self.expectOutcome(result=FAILURE, state_string='extracted built product (failure)')
+ self.expectOutcome(result=FAILURE, state_string='Extracted built product (failure)')
return self.runStep()
@@ -1149,7 +1149,7 @@
)
+ 0,
)
- self.expectOutcome(result=SUCCESS, state_string='archived test results')
+ self.expectOutcome(result=SUCCESS, state_string='Archived test results')
return self.runStep()
def test_failure(self):
@@ -1164,7 +1164,7 @@
+ ExpectShell.log('stdio', stdout='Unexpected failure.')
+ 2,
)
- self.expectOutcome(result=FAILURE, state_string='archived test results (failure)')
+ self.expectOutcome(result=FAILURE, state_string='Archived test results (failure)')
return self.runStep()
@@ -1195,7 +1195,7 @@
)
self.expectUploadedFile('public_html/results/macOS-Sierra-Release-WK2-Tests-EWS/r1234-12.zip')
- self.expectOutcome(result=SUCCESS, state_string='uploading layout-test-results.zip')
+ self.expectOutcome(result=SUCCESS, state_string='Uploaded test results')
return self.runStep()
@@ -1221,7 +1221,7 @@
])
+ 0,
)
- self.expectOutcome(result=SUCCESS, state_string='uploaded results')
+ self.expectOutcome(result=SUCCESS, state_string='Extracted test results')
self.expectAddedURLs([call('view layout test results', '/results/test/r2468_ab1a28b4feee0d42973c7c05335b35bca927e974 (1)/results.html')])
return self.runStep()