Skip to content

Commit

Permalink
Auto merge of #19450 - asajeffrey:buildbot-perf-upload-to-s3, r=jdm
Browse files Browse the repository at this point in the history
Upload buildbot perf data to S3.

<!-- Please describe your changes on the following line: -->

Upload performance data to S3.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because this is test infrastructure

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19450)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Dec 4, 2017
2 parents eed3adc + 524df9e commit ed03917
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
4 changes: 3 additions & 1 deletion etc/ci/buildbot_steps.yml
Expand Up @@ -113,7 +113,9 @@ linux-nightly:
- env CC=gcc-5 CXX=g++-5 ./mach build --release
- ./mach package --release
- ./mach upload-nightly linux
- ./mach test-perf --submit
- ./mach test-perf
- python ./etc/ci/performance/download_buildbot_timings.py --verbose
- aws s3 sync --size-only --acl public-read ./etc/ci/performance/output s3://servo-perf

android:
- ./mach clean-nightlies --keep 3 --force
Expand Down
15 changes: 9 additions & 6 deletions etc/ci/performance/download_buildbot_timings.py
Expand Up @@ -12,8 +12,13 @@
from math import floor
import os

SCRIPT_PATH = os.path.split(__file__)[0]


def main():
default_output_dir = os.path.join(SCRIPT_PATH, 'output')
default_cache_dir = os.path.join(SCRIPT_PATH, '.cache')

parser = argparse.ArgumentParser(
description="Download buildbot metadata"
)
Expand All @@ -29,19 +34,17 @@ def main():
"Default: http://build.servo.org/json/builders/{}/builds/{}")
parser.add_argument("--cache-dir",
type=str,
default='.cache',
help="the directory to cache JSON files in. "
"Default: .cache")
default=default_cache_dir,
help="the directory to cache JSON files in. Default: " + default_cache_dir)
parser.add_argument("--cache-name",
type=str,
default='build-{}-{}.json',
help="the filename to cache JSON data in. "
"Default: build-{}-{}.json")
parser.add_argument("--output-dir",
type=str,
default='output',
help="the directory to save the CSV data to. "
"Default: output")
default=default_output_dir,
help="the directory to save the CSV data to. Default: " + default_output_dir)
parser.add_argument("--output-name",
type=str,
default='builds-{}-{}.csv',
Expand Down

0 comments on commit ed03917

Please sign in to comment.