Changeset 245433 in webkit
- Timestamp:
- May 16, 2019 9:30:32 PM (5 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/ews-build/steps.py
r245365 r245433 34 34 35 35 BUG_SERVER_URL = 'https://bugs.webkit.org/' 36 EWS_URL = 'https://ews-build.webkit.org/'36 S3URL = 'https://s3-us-west-2.amazonaws.com/' 37 37 WithProperties = properties.WithProperties 38 38 Interpolate = properties.Interpolate … … 786 786 class DownloadBuiltProduct(shell.ShellCommand): 787 787 command = ['python', 'Tools/BuildSlaveSupport/download-built-product', 788 WithProperties('-- platform=%(platform)s'), WithProperties('--%(configuration)s'),789 WithProperties( EWS_URL + 'archives/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')]788 WithProperties('--%(configuration)s'), 789 WithProperties(S3URL + 'ews-archives.webkit.org/%(fullPlatform)s-%(architecture)s-%(configuration)s/%(patch_id)s.zip')] 790 790 name = 'download-built-product' 791 791 description = ['downloading built product'] … … 793 793 haltOnFailure = True 794 794 flunkOnFailure = True 795 796 def getResultSummary(self): 797 if self.results != SUCCESS: 798 return {u'step': u'Failed to download built product from S3'} 799 return super(DownloadBuiltProduct, self).getResultSummary() 795 800 796 801 -
trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py
r245141 r245433 1008 1008 def test_success(self): 1009 1009 self.setupStep(DownloadBuiltProduct()) 1010 self.setProperty('platform', 'ios')1011 1010 self.setProperty('fullPlatform', 'ios-simulator-12') 1012 1011 self.setProperty('configuration', 'release') … … 1015 1014 self.expectRemoteCommands( 1016 1015 ExpectShell(workdir='wkdir', 1017 command=['python', 'Tools/BuildSlaveSupport/download-built-product', '-- platform=ios', '--release', 'https://ews-build.webkit.org/archives/ios-simulator-12-x86_64-release/1234.zip'],1016 command=['python', 'Tools/BuildSlaveSupport/download-built-product', '--release', 'https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/ios-simulator-12-x86_64-release/1234.zip'], 1018 1017 ) 1019 1018 + 0, … … 1024 1023 def test_failure(self): 1025 1024 self.setupStep(DownloadBuiltProduct()) 1026 self.setProperty('platform', 'mac')1027 1025 self.setProperty('fullPlatform', 'mac-sierra') 1028 1026 self.setProperty('configuration', 'debug') … … 1031 1029 self.expectRemoteCommands( 1032 1030 ExpectShell(workdir='wkdir', 1033 command=['python', 'Tools/BuildSlaveSupport/download-built-product', '-- platform=mac', '--debug', 'https://ews-build.webkit.org/archives/mac-sierra-x86_64-debug/123456.zip'],1031 command=['python', 'Tools/BuildSlaveSupport/download-built-product', '--debug', 'https://s3-us-west-2.amazonaws.com/ews-archives.webkit.org/mac-sierra-x86_64-debug/123456.zip'], 1034 1032 ) 1035 1033 + ExpectShell.log('stdio', stdout='Unexpected failure.') 1036 1034 + 2, 1037 1035 ) 1038 self.expectOutcome(result=FAILURE, state_string=' Downloaded built product (failure)')1036 self.expectOutcome(result=FAILURE, state_string='Failed to download built product from S3') 1039 1037 return self.runStep() 1040 1038 -
trunk/Tools/ChangeLog
r245430 r245433 1 2019-05-16 Aakash Jain <aakash_jain@apple.com> 2 3 [ews-build] Download archives from S3 4 https://bugs.webkit.org/show_bug.cgi?id=197949 5 6 Reviewed by Jonathan Bedard. 7 8 * BuildSlaveSupport/ews-build/steps.py: 9 (DownloadBuiltProduct): Updated to use S3 URL. 10 (DownloadBuiltProduct.getResultSummary): Method to display custom failure string. 11 * BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests. 12 1 13 2019-05-16 David Kilzer <ddkilzer@apple.com> 2 14
Note: See TracChangeset
for help on using the changeset viewer.