Changeset 245359 in webkit

Timestamp:

May 15, 2019 3:21:24 PM (5 years ago)

Author:

aakash_jain@apple.com

Message:

[ews-build] Enabling uploading EWS archives to S3
​https://bugs.webkit.org/show_bug.cgi?id=197914

Reviewed by Jonathan Bedard.

• BuildSlaveSupport/Shared: Added.
• BuildSlaveSupport/Shared/transfer-archive-to-s3: Moved from Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3.

(archiveExists): Replace tab with space.
(main): Added main method.

• BuildSlaveSupport/build.webkit.org-config/steps.py:

(TransferToS3): Updated path to the script.

• BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3: Moved to Shared folder.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/Shared (added)
• BuildSlaveSupport/Shared/transfer-archive-to-s3 (moved) (moved from trunk/Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3) (3 diffs)
• BuildSlaveSupport/build.webkit.org-config/steps.py (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/Shared/transfer-archive-to-s3

@@ -3 +3 @@
 import boto3
 import os
-import os.path
 import sys
 
-S3_BUCKET = 'archives.webkit.org'
+S3_DEFAULT_BUCKET = 'archives.webkit.org'
+S3_EWS_BUCKET = 'ews-archives.webkit.org'
 S3_MINIFIED_BUCKET = 'minified-archives.webkit.org'
 S3_REGION_PREFIX = 'https://s3-us-west-2.amazonaws.com'
@@ -14 +14 @@
     key = '/'.join([identifier, revision + '.zip'])
     print '\tS3 Bucket: {}\n\tS3 Key: {}'.format(bucket, key)
+    s3 = boto3.client('s3')
     s3.upload_file(archive_path, bucket, key)
     print('\tS3 URL: {}/{}/{}'.format(S3_REGION_PREFIX, bucket, key))
@@ -20 +21 @@
     if archive:
         if os.path.exists(archive):
-                return True
+            return True
         else:
             print 'WARNING: Archive does not exist: {}'.format(archive)
             return False
-        
-parser = argparse.ArgumentParser(add_help=True)
-parser.add_argument('--revision', action="store", required=True, help='Revision number for the built archive')
-parser.add_argument('--identifier', action="store", required=True, help='S3 destination identifier, in the form of fullPlatform-architecture-configuration. [mac-sierra-x86_64-release]')
-parser.add_argument('--archive', action="store", required=True, help='Path to the full size archive. [path/to/123456.zip]')
-args = parser.parse_args()
 
+def main():
+    parser = argparse.ArgumentParser(add_help=True)
 
-head, tail = os.path.split(str(args.archive))
-minifiedArchive = head + '/minified-' + tail
-s3 = boto3.client('s3')
+    group = parser.add_mutually_exclusive_group(required=True)
+    group.add_argument('--revision', action="store", help='Revision number or patch_id for the built archive')
+    group.add_argument('--patch_id', action="store", help='patch_id of the patch')
 
-if archiveExists(args.archive):
-    uploadToS3(args.archive, S3_BUCKET, args.identifier, args.revision)
-if archiveExists(minifiedArchive):
-    uploadToS3(minifiedArchive, S3_MINIFIED_BUCKET, args.identifier, args.revision)
+    parser.add_argument('--identifier', action="store", required=True, help='S3 destination identifier, in the form of fullPlatform-architecture-configuration. [mac-mojave-x86_64-release]')
+    parser.add_argument('--archive', action="store", required=True, help='Path to the full size archive. [path/to/123456.zip]')
+    args = parser.parse_args()
+
+    parentdir, filename = os.path.split(str(args.archive))
+    minifiedArchive = os.path.join(parentdir, 'minified-' + filename)
+
+    s3_bucket = S3_DEFAULT_BUCKET
+    if args.patch_id:
+        s3_bucket = S3_EWS_BUCKET
+
+    if archiveExists(args.archive):
+        uploadToS3(args.archive, s3_bucket, args.identifier, args.revision or args.patch_id)
+    if not args.patch_id and archiveExists(minifiedArchive):
+        uploadToS3(minifiedArchive, S3_MINIFIED_BUCKET, args.identifier, args.revision)
+
+if __name__ == "__main__":
+    main()

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py

@@ -875 +875 @@
     identifier = WithProperties("%(fullPlatform)s-%(architecture)s-%(configuration)s")
     revision = WithProperties("%(got_revision)s")
-    command = ["python", "./transfer-archive-to-s3", "--revision", revision, "--identifier", identifier, "--archive", archive]
+    command = ["python", "../Shared/transfer-archive-to-s3", "--revision", revision, "--identifier", identifier, "--archive", archive]
     haltOnFailure = True
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-15  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews-build] Enabling uploading EWS archives to S3
+        https://bugs.webkit.org/show_bug.cgi?id=197914
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/Shared: Added.
+        * BuildSlaveSupport/Shared/transfer-archive-to-s3: Moved from Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3.
+        (archiveExists): Replace tab with space.
+        (main): Added main method.
+        * BuildSlaveSupport/build.webkit.org-config/steps.py:
+        (TransferToS3): Updated path to the script.
+        * BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3: Moved to Shared folder.
+
 2019-05-15  Wenson Hsieh  <wenson_hsieh@apple.com>