Title: [293023] trunk/Tools
- Revision
- 293023
- Author
- jbed...@apple.com
- Date
- 2022-04-19 10:35:20 -0700 (Tue, 19 Apr 2022)
Log Message
[build.webkit.org] Use identifier as version when uploading artifacts (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=239321
<rdar://problem/91734798>
Reviewed by Aakash Jain and Ryan Haddad.
* Tools/CISupport/build-webkit-org/steps.py:
(UploadTestResults): Strip leading r.
(ExtractTestResults.__init__): Ditto.
Canonical link: https://commits.webkit.org/249762@main
Modified Paths
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (293022 => 293023)
--- trunk/Tools/CISupport/build-webkit-org/steps.py 2022-04-19 17:31:42 UTC (rev 293022)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2022-04-19 17:35:20 UTC (rev 293023)
@@ -1114,7 +1114,7 @@
class UploadTestResults(transfer.FileUpload):
workersrc = "layout-test-results.zip"
- masterdest = WithProperties("public_html/results/%(buildername)s/r%(archive_revision)s (%(buildnumber)s).zip")
+ masterdest = WithProperties("public_html/results/%(buildername)s/%(archive_revision)s (%(buildnumber)s).zip")
def __init__(self, **kwargs):
kwargs['workersrc'] = self.workersrc
@@ -1158,8 +1158,8 @@
def __init__(self, **kwargs):
kwargs['command'] = ""
kwargs['logEnviron'] = False
- self.zipFile = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:archive_revision)s (%(prop:buildnumber)s).zip')
- self.resultDirectory = Interpolate('public_html/results/%(prop:buildername)s/r%(prop:archive_revision)s (%(prop:buildnumber)s)')
+ self.zipFile = Interpolate('public_html/results/%(prop:buildername)s/%(prop:archive_revision)s (%(prop:buildnumber)s).zip')
+ self.resultDirectory = Interpolate('public_html/results/%(prop:buildername)s/%(prop:archive_revision)s (%(prop:buildnumber)s)')
kwargs['command'] = ['unzip', '-q', '-o', self.zipFile, '-d', self.resultDirectory]
master.MasterShellCommand.__init__(self, **kwargs)
Modified: trunk/Tools/ChangeLog (293022 => 293023)
--- trunk/Tools/ChangeLog 2022-04-19 17:31:42 UTC (rev 293022)
+++ trunk/Tools/ChangeLog 2022-04-19 17:35:20 UTC (rev 293023)
@@ -1,3 +1,15 @@
+2022-04-18 Jonathan Bedard <jbed...@apple.com>
+
+ [build.webkit.org] Use identifier as version when uploading artifacts (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=239321
+ <rdar://problem/91734798>
+
+ Reviewed by Aakash Jain and Ryan Haddad.
+
+ * CISupport/build-webkit-org/steps.py:
+ (UploadTestResults): Strip leading r.
+ (ExtractTestResults.__init__): Ditto.
+
2022-04-19 Aakash Jain <aakash_j...@apple.com>
Delete old buildbot code from bot watchers dashboard
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
