Attachment 369949 Details for Bug 197914 – Patch

[patch] Patch

bug-197914-20190515101608.patch (text/plain), 4.89 KB, created by Aakash Jain on 2019-05-15 07:16:09 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2019-05-15 07:16:09 PDT

Size: 4.89 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 245321)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+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 NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/ews-build/transfer-ews-archive-to-s3: Copied from Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3.
>+
> 2019-05-14  Andy Estes  <aestes@apple.com>
> 
>         [Apple Pay] Payment APIs should be completely disabled in web views into which clients have injected user scripts
>Index: Tools/BuildSlaveSupport/ews-build/transfer-ews-archive-to-s3
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/transfer-ews-archive-to-s3	(revision 245321)	(from Tools/BuildSlaveSupport/build.webkit.org-config/transfer-archive-to-s3:245321)
>+++ Tools/BuildSlaveSupport/ews-build/transfer-ews-archive-to-s3	(working copy)
>@@ -0,0 +1,41 @@
>+#!/usr/bin/env python
>+import argparse
>+import boto3
>+import os
>+import os.path
>+import sys
>+
>+S3_BUCKET = 'archives.webkit.org'
>+S3_MINIFIED_BUCKET = 'minified-archives.webkit.org'
>+S3_REGION_PREFIX = 'https://s3-us-west-2.amazonaws.com'
>+
>+def uploadToS3(archive_path, bucket, identifier, revision):
>+    print 'Transferring {} to S3...'.format(archive_path)
>+    key = '/'.join([identifier, revision + '.zip'])
>+    print '\tS3 Bucket: {}\n\tS3 Key: {}'.format(bucket, key)
>+    s3.upload_file(archive_path, bucket, key)
>+    print('\tS3 URL: {}/{}/{}'.format(S3_REGION_PREFIX, bucket, key))
>+
>+def archiveExists(archive):
>+    if archive:
>+        if os.path.exists(archive):
>+	        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()
>+
>+
>+head, tail = os.path.split(str(args.archive))
>+minifiedArchive = head + '/minified-' + tail
>+s3 = boto3.client('s3')
>+
>+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)
>\ No newline at end of file
>Index: Tools/BuildSlaveSupport/ews-build/transfer-ews-archive-to-s3
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/transfer-ews-archive-to-s3	(revision 245321)
>+++ Tools/BuildSlaveSupport/ews-build/transfer-ews-archive-to-s3	(working copy)
>@@ -5,13 +5,12 @@ import os
> import os.path
> import sys
> 
>-S3_BUCKET = 'archives.webkit.org'
>-S3_MINIFIED_BUCKET = 'minified-archives.webkit.org'
>+S3_BUCKET = 'ews-archives.webkit.org'
> S3_REGION_PREFIX = 'https://s3-us-west-2.amazonaws.com'
> 
>-def uploadToS3(archive_path, bucket, identifier, revision):
>+def uploadToS3(archive_path, bucket, identifier, patch_id):
>     print 'Transferring {} to S3...'.format(archive_path)
>-    key = '/'.join([identifier, revision + '.zip'])
>+    key = '/'.join([identifier, patch_id + '.zip'])
>     print '\tS3 Bucket: {}\n\tS3 Key: {}'.format(bucket, key)
>     s3.upload_file(archive_path, bucket, key)
>     print('\tS3 URL: {}/{}/{}'.format(S3_REGION_PREFIX, bucket, key))
>@@ -25,7 +24,7 @@ def archiveExists(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('--patch_id', action="store", required=True, help='patch_id of the patch')
> 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()
>@@ -35,7 +34,6 @@ head, tail = os.path.split(str(args.arch
> minifiedArchive = head + '/minified-' + tail
> s3 = boto3.client('s3')
> 
>-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)
>\ No newline at end of file
>+if not archiveExists(args.archive):
>+    sys.exit(1)
>+uploadToS3(args.archive, S3_BUCKET, args.identifier, args.patch_id)

Actions: View | Formatted Diff | Diff

Attachments on bug 197914: 369949 | 369970 | 369977 | 369991