Changeset 271801 in webkit

Timestamp:

Jan 25, 2021 10:52:52 AM (3 years ago)

Author:

aakash_jain@apple.com

Message:

layout-test results shouldn't be hosted on build.webkit.org server
​https://bugs.webkit.org/show_bug.cgi?id=220864

Reviewed by Jonathan Bedard.

• CISupport/build-webkit-org/steps.py:

(ExtractTestResults.resultDirectoryURL):

Location:

trunk/Tools

Files:

• CISupport/build-webkit-org/steps.py (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/CISupport/build-webkit-org/steps.py

@@ -1 @@
-# Copyright (C) 2017-2020 Apple Inc. All rights reserved.
+# Copyright (C) 2017-2021 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -38 +38 @@
 RESULTS_WEBKIT_URL = 'https://results.webkit.org'
 RESULTS_SERVER_API_KEY = 'RESULTS_SERVER_API_KEY'
-S3URL = "https://s3-us-west-2.amazonaws.com/"
+S3URL = 'https://s3-us-west-2.amazonaws.com/'
+S3_RESULTS_URL = '{}build.webkit.org-results/'.format(S3URL)
 USE_BUILDBOT_VERSION2 = os.getenv('USE_BUILDBOT_VERSION2') is not None
 WithProperties = properties.WithProperties
@@ -1275 +1276 @@
     def resultDirectoryURL(self):
         if USE_BUILDBOT_VERSION2:
-            return self.resultDirectory.replace('public_html/', '/') + '/'
+            path = self.resultDirectory.replace('public_html/results/', '') + '/'
+            return '{}{}'.format(S3_RESULTS_URL, path)
         else:
             return self.build.getProperties().render(self.resultDirectory).replace('public_html/', '/') + '/'

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-25  Aakash Jain  <aakash_jain@apple.com>
+
+        layout-test results shouldn't be hosted on build.webkit.org server
+        https://bugs.webkit.org/show_bug.cgi?id=220864
+
+        Reviewed by Jonathan Bedard.
+
+        * CISupport/build-webkit-org/steps.py:
+        (ExtractTestResults.resultDirectoryURL):
+
 2021-01-25  John Wilander  <wilander@apple.com>