Title: [269249] trunk/Tools
Revision
269249
Author
[email protected]
Date
2020-11-02 09:23:03 -0800 (Mon, 02 Nov 2020)

Log Message

Don't fail the build on S3 upload failure
https://bugs.webkit.org/show_bug.cgi?id=218438

Patch by Angelos Oikonomopoulos <[email protected]> on 2020-11-02
Reviewed by Aakash Jain.

This allows buildbots to keep going even when S3 is down. Using
S3 is not strictly necessary, as the built product can also be
downloaded from the buildbot server.

Patch-by: [email protected]

* CISupport/ews-build/steps.py:
(CompileWebKit.evaluateCommand):
(TransferToS3):
(TransferToS3.finished):

Modified Paths

Diff

Modified: trunk/Tools/CISupport/ews-build/steps.py (269248 => 269249)


--- trunk/Tools/CISupport/ews-build/steps.py	2020-11-02 16:59:27 UTC (rev 269248)
+++ trunk/Tools/CISupport/ews-build/steps.py	2020-11-02 17:23:03 UTC (rev 269249)
@@ -1400,7 +1400,10 @@
         else:
             triggers = self.getProperty('triggers', None)
             if triggers or not self.skipUpload:
-                self.build.addStepsAfterCurrentStep([ArchiveBuiltProduct(), UploadBuiltProduct(), TransferToS3()])
+                steps_to_add = [ArchiveBuiltProduct(), UploadBuiltProduct(), TransferToS3()]
+                if triggers:
+                    steps_to_add.append(Trigger(schedulerNames=triggers))
+                self.build.addStepsAfterCurrentStep(steps_to_add)
 
         return super(CompileWebKit, self).evaluateCommand(cmd)
 
@@ -2381,8 +2384,8 @@
     identifier = WithProperties('%(fullPlatform)s-%(architecture)s-%(configuration)s')
     patch_id = WithProperties('%(patch_id)s')
     command = ['python', '../Shared/transfer-archive-to-s3', '--patch_id', patch_id, '--identifier', identifier, '--archive', archive]
-    haltOnFailure = True
-    flunkOnFailure = True
+    haltOnFailure = False
+    flunkOnFailure = False
 
     def __init__(self, **kwargs):
         kwargs['command'] = self.command
@@ -2399,12 +2402,6 @@
         # Sample log: S3 URL: https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/ios-simulator-12-x86_64-release/123456.zip
         if match:
             self.addURL('uploaded archive', match.group('url'))
-
-        if results == SUCCESS:
-            triggers = self.getProperty('triggers', None)
-            if triggers:
-                self.build.addStepsAfterCurrentStep([Trigger(schedulerNames=triggers)])
-
         return super(TransferToS3, self).finished(results)
 
     def doStepIf(self, step):

Modified: trunk/Tools/ChangeLog (269248 => 269249)


--- trunk/Tools/ChangeLog	2020-11-02 16:59:27 UTC (rev 269248)
+++ trunk/Tools/ChangeLog	2020-11-02 17:23:03 UTC (rev 269249)
@@ -1,5 +1,23 @@
 2020-11-02  Angelos Oikonomopoulos  <[email protected]>
 
+        Don't fail the build on S3 upload failure
+        https://bugs.webkit.org/show_bug.cgi?id=218438
+
+        Reviewed by Aakash Jain.
+
+        This allows buildbots to keep going even when S3 is down. Using
+        S3 is not strictly necessary, as the built product can also be
+        downloaded from the buildbot server.
+
+        Patch-by: [email protected]
+
+        * CISupport/ews-build/steps.py:
+        (CompileWebKit.evaluateCommand):
+        (TransferToS3):
+        (TransferToS3.finished):
+
+2020-11-02  Angelos Oikonomopoulos  <[email protected]>
+
         Only upload to S3 when running on ews-build.webkit.org
         https://bugs.webkit.org/show_bug.cgi?id=218439
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to