Changeset 251450 in webkit

Timestamp:

Oct 22, 2019, 1:40:06 PM (6 years ago)

Author:

aakash_jain@apple.com

Message:

[ews] Download the build archive from master when download from S3 fails
​https://bugs.webkit.org/show_bug.cgi?id=203263

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/ews-build/steps.py:

(DownloadBuiltProduct.evaluateCommand):
(DownloadBuiltProductFromMaster): Build step to download the archive from build master.
(DownloadBuiltProductFromMaster.getResultSummary): Added custom failure message.
(DownloadBuiltProductFromMaster.evaluateCommand): Overrided to ensure it doesn't use this method from base
class DownloadBuiltProduct.

• BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-tests.

Location:

trunk/Tools

Files:

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

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

@@ -37 +37 @@
 BUG_SERVER_URL = 'https://bugs.webkit.org/'
 S3URL = 'https://s3-us-west-2.amazonaws.com/'
+EWS_URL = 'https://ews-build.webkit.org/'
 WithProperties = properties.WithProperties
 Interpolate = properties.Interpolate
@@ -1298 +1299 @@
     description = ['downloading built product']
     descriptionDone = ['Downloaded built product']
-    haltOnFailure = True
-    flunkOnFailure = True
+    flunkOnFailure = False
 
     def getResultSummary(self):
@@ -1308 +1308 @@
     def __init__(self, **kwargs):
         super(DownloadBuiltProduct, self).__init__(logEnviron=False, **kwargs)
+
+    def evaluateCommand(self, cmd):
+        rc = shell.ShellCommand.evaluateCommand(self, cmd)
+        if rc == FAILURE:
+            self.build.addStepsAfterCurrentStep([DownloadBuiltProductFromMaster()])
+        return rc
+
+
+class DownloadBuiltProductFromMaster(DownloadBuiltProduct):
+    command = ['python', 'Tools/BuildSlaveSupport/download-built-product',
+        WithProperties('--%(configuration)s'),
+        WithProperties(EWS_URL + 'archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')]
+    haltOnFailure = True
+    flunkOnFailure = True
+
+    def getResultSummary(self):
+        if self.results != SUCCESS:
+            return {u'step': u'Failed to download built product from build master'}
+        return shell.ShellCommand.getResultSummary(self)
+
+    def evaluateCommand(self, cmd):
+        return shell.ShellCommand.evaluateCommand(self, cmd)
 
 

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

@@ -38 +38 @@
                    CheckOutSource, CheckOutSpecificRevision, CheckPatchRelevance, CheckStyle, CleanBuild, CleanUpGitIndexLock, CleanWorkingDirectory,
                    CompileJSC, CompileJSCToT, CompileWebKit, CompileWebKitToT, ConfigureBuild,
-                   DownloadBuiltProduct, ExtractBuiltProduct, ExtractTestResults, InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses,
+                   DownloadBuiltProduct, DownloadBuiltProductFromMaster, ExtractBuiltProduct, ExtractTestResults, InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses,
                    PrintConfiguration, ReRunAPITests, ReRunJavaScriptCoreTests, ReRunWebKitTests, RunAPITests, RunAPITestsWithoutPatch,
                    RunBindingsTests, RunBuildWebKitOrgUnitTests, RunEWSBuildbotCheckConfig, RunEWSUnitTests, RunJavaScriptCoreTests, RunJavaScriptCoreTestsToT, RunWebKit1Tests,
@@ -1718 +1718 @@
         )
         self.expectOutcome(result=FAILURE, state_string='Failed to download built product from S3')
+        return self.runStep()
+
+
+class TestDownloadBuiltProductFromMaster(BuildStepMixinAdditions, unittest.TestCase):
+    def setUp(self):
+        self.longMessage = True
+        return self.setUpBuildStep()
+
+    def tearDown(self):
+        return self.tearDownBuildStep()
+
+    def test_success(self):
+        self.setupStep(DownloadBuiltProductFromMaster())
+        self.setProperty('fullPlatform', 'ios-simulator-12')
+        self.setProperty('configuration', 'release')
+        self.setProperty('architecture', 'x86_64')
+        self.setProperty('patch_id', '1234')
+        self.expectRemoteCommands(
+            ExpectShell(workdir='wkdir',
+                        logEnviron=False,
+                        command=['python', 'Tools/BuildSlaveSupport/download-built-product', '--release', 'https://ews-build.webkit.org/archives/ios-simulator-12-x86_64-release/1234.zip'],
+                        )
+            + 0,
+        )
+        self.expectOutcome(result=SUCCESS, state_string='Downloaded built product')
+        return self.runStep()
+
+    def test_failure(self):
+        self.setupStep(DownloadBuiltProductFromMaster())
+        self.setProperty('fullPlatform', 'mac-sierra')
+        self.setProperty('configuration', 'debug')
+        self.setProperty('architecture', 'x86_64')
+        self.setProperty('patch_id', '123456')
+        self.expectRemoteCommands(
+            ExpectShell(workdir='wkdir',
+                        logEnviron=False,
+                        command=['python', 'Tools/BuildSlaveSupport/download-built-product', '--debug', 'https://ews-build.webkit.org/archives/mac-sierra-x86_64-debug/123456.zip'],
+                        )
+            + ExpectShell.log('stdio', stdout='Unexpected failure.')
+            + 2,
+        )
+        self.expectOutcome(result=FAILURE, state_string='Failed to download built product from build master')
         return self.runStep()
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-10-22  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews] Download the build archive from master when download from S3 fails
+        https://bugs.webkit.org/show_bug.cgi?id=203263
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-build/steps.py:
+        (DownloadBuiltProduct.evaluateCommand):
+        (DownloadBuiltProductFromMaster): Build step to download the archive from build master.
+        (DownloadBuiltProductFromMaster.getResultSummary): Added custom failure message.
+        (DownloadBuiltProductFromMaster.evaluateCommand): Overrided to ensure it doesn't use this method from base
+        class DownloadBuiltProduct.
+        * BuildSlaveSupport/ews-build/steps_unittest.py: Added unit-tests.
+
 2019-10-22  youenn fablet  <youenn@apple.com>