diff options
| author |  borenet <borenet@chromium.org> | 2016-07-27 08:51:55 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-27 08:51:55 -0700 |
| commit | 7b2ed4c64923445893841b5daa4f87c34aeef860 (patch) | |
| tree | 109a535b9b31bab484ad9fa57231ba0e210909f7 /infra | |
| parent | ccde4ab8e6f5d9f0634d7f156dc1617fd0e48581 (diff) | |
Fix Perf data upload
BUG=skia:5563
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2187603005
Review-Url: https://codereview.chromium.org/2187603005
Diffstat (limited to 'infra')
5 files changed, 8 insertions, 13 deletions
diff --git a/infra/bots/recipe_modules/skia/resources/generate_and_upload_doxygen.py b/infra/bots/recipe_modules/skia/resources/generate_and_upload_doxygen.py index 019fbdc5b9..f06ea96bc7 100755 --- a/infra/bots/recipe_modules/skia/resources/generate_and_upload_doxygen.py +++ b/infra/bots/recipe_modules/skia/resources/generate_and_upload_doxygen.py @@ -13,15 +13,13 @@ import shutil import subprocess import sys -from common.skia import global_constants - DOXYFILE_BASENAME = 'Doxyfile' # must match name of Doxyfile in skia root DOXYGEN_BINARY = 'doxygen' WORKDIR = os.path.join(os.pardir, 'doxygen_workdir') DOXYGEN_CONFIG_DIR = os.path.join(WORKDIR, 'doxygen-config') DOXYGEN_WORKING_DIR = os.path.join(WORKDIR, 'doxygen') -DOXYGEN_GS_PATH = '/'.join(['gs:/', global_constants.GS_GM_BUCKET, 'doxygen']) +DOXYGEN_GS_PATH = '/'.join(['gs://chromium-skia-gm', 'doxygen']) IFRAME_FOOTER_TEMPLATE = """ <html><body><address style="text-align: right;"><small> diff --git a/infra/bots/recipe_modules/skia/resources/run_binary_size_analysis.py b/infra/bots/recipe_modules/skia/resources/run_binary_size_analysis.py index f8c3c830ad..5cb24d967a 100755 --- a/infra/bots/recipe_modules/skia/resources/run_binary_size_analysis.py +++ b/infra/bots/recipe_modules/skia/resources/run_binary_size_analysis.py @@ -95,9 +95,6 @@ import elf_symbolizer from recipe_engine.types import freeze -# Skia addition -from common.skia import global_constants - # Node dictionary keys. These are output in json read by the webapp so # keep them short to save file size. # Note: If these change, the webapp must also change. @@ -338,7 +335,7 @@ def DumpCompactTree(symbols, symbol_path_origin_dir, ha, ts, issue, gsutil): # Use separators without whitespace to get a smaller file. json.dump(json_data, out, separators=(',', ':')) - GS_PREFIX = 'gs://' + global_constants.GS_GM_BUCKET + '/' + GS_PREFIX = 'gs://chromium-skia-gm/' # Writes to Google Storage for visualization. subprocess.check_call(GetGsCopyCommandList( gsutil, tmpfile, GS_PREFIX + 'size/' + ha + '.json')) diff --git a/infra/bots/recipe_modules/skia/resources/upload_bench_results.py b/infra/bots/recipe_modules/skia/resources/upload_bench_results.py index 9c17f8777f..4c80564c00 100755 --- a/infra/bots/recipe_modules/skia/resources/upload_bench_results.py +++ b/infra/bots/recipe_modules/skia/resources/upload_bench_results.py @@ -13,8 +13,6 @@ import subprocess import sys import tempfile -from common.skia import builder_name_schema -from common.skia import global_constants from datetime import datetime @@ -25,7 +23,7 @@ def _UploadJSONResults(builder_name, build_number, dest_gsbase, gs_subdir, gs_json_path = '/'.join((str(now.year).zfill(4), str(now.month).zfill(2), str(now.day).zfill(2), str(now.hour).zfill(2))) gs_dir = '/'.join((gs_subdir, gs_json_path, builder_name)) - if builder_name_schema.IsTrybot(builder_name): + if builder_name.endswith('-Trybot'): if not issue_number: raise Exception('issue_number build property is missing!') gs_dir = '/'.join(('trybot', gs_dir, build_number, issue_number)) @@ -64,7 +62,7 @@ def main(builder_name, build_number, perf_data_dir, got_revision, gsutil_path, break if nanobench_name: - dest_gsbase = 'gs://' + global_constants.GS_GM_BUCKET + dest_gsbase = 'gs://chromium-skia-gm/' nanobench_json_file = os.path.join(perf_data_dir, nanobench_name) _UploadJSONResults(builder_name, build_number, dest_gsbase, 'nano-json-v1', diff --git a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json index dcdf88dc44..1fdfa8bfbd 100644 --- a/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json +++ b/infra/bots/recipes/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot.json @@ -866,7 +866,7 @@ "5", "[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Trybot/data", "abc123", - "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py", + "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/depot_tools/third_party/gsutil/gsutil", "500" ], "cwd": "[ROOT]/skia", diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py index 5bc7ca653c..8288e93a5e 100644 --- a/infra/bots/recipes/swarm_trigger.py +++ b/infra/bots/recipes/swarm_trigger.py @@ -400,7 +400,9 @@ def perf_steps_collect(api, task, upload_perf_results, got_revision, api.file.copy('perf_results', src_results_file, dst_results_file, infra_step=True) - gsutil_path = api.depot_tools.gsutil_py_path + gsutil_path = api.path['slave_build'].join( + 'skia', 'infra', 'bots', '.recipe_deps', 'depot_tools', 'third_party', + 'gsutil', 'gsutil') upload_args = [api.properties['buildername'], api.properties['buildnumber'], perf_data_dir, got_revision, gsutil_path] if is_trybot: |