scripts/slave/recipe_modules/chromium_android/example.expected/resource_size_builder_basic.json - Issue 2238243003: Merge method_counts into resource_sizes

Unified Diff: scripts/slave/recipe_modules/chromium_android/example.expected/resource_size_builder_basic.json

Issue 2238243003: Merge method_counts into resource_sizes (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: split adding resource_sizes to perf bot into a separate change Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/example.expected/java_method_count_builder_basic.json ('k') | scripts/slave/recipes/cronet.expected/android_cronet_arm64_builder.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipe_modules/chromium_android/example.expected/resource_size_builder_basic.json

diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/resource_size_builder_basic.json b/scripts/slave/recipe_modules/chromium_android/example.expected/resource_size_builder_basic.json

index 0290c1a2fbed19f823ff4a9a0a50f65c73036efb..eb7ac6fd0e47d49523ca1010be6ba25ffd192ef8 100644

--- a/scripts/slave/recipe_modules/chromium_android/example.expected/resource_size_builder_basic.json

+++ b/scripts/slave/recipe_modules/chromium_android/example.expected/resource_size_builder_basic.json

@@ -848,6 +848,67 @@

"name": "run bisect perf regression"

{

+ "cmd": [

+ "python",

+ "-u",

+ "[SLAVE_BUILD]/src/build/android/test_runner.py",

+ "perf",

+ "--release",

+ "--verbose",

+ "--steps",

+ "{\"steps\": {\"resource_sizes\": {\"archive_output_dir\": true, \"cmd\": \"build/android/resource_sizes.py '[SLAVE_BUILD]/src/out/Release/apks/Example.apk' --chartjson\", \"device_affinity\": null}}, \"version\": 1}",

+ "--blacklist-file",

+ "[SLAVE_BUILD]/src/out/bad_devices.json",

+ "--collect-chartjson-data",

+ "--adb-path",

+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"

+ ],

+ "cwd": "[SLAVE_BUILD]/src",

+ "env": {

+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",

+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "Sharded Perf Tests"

jbudorick 2016/09/02 19:04:22 I'm concerned that this may be confusing for peopl

agrieve 2016/09/02 19:42:06 It's certainly confusing.

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "[SLAVE_BUILD]/src/build/android/test_runner.py",

+ "perf",

+ "--steps",

+ "--output-json-list",

+ "/path/to/tmp/json",

+ "--blacklist-file",

+ "[SLAVE_BUILD]/src/out/bad_devices.json",

+ "--adb-path",

+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"

+ ],

+ "env": {

+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",

+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "get perf test list",

+ "~followup_annotations": [

+ "@@@STEP_LOG_LINE@json.output@[@@@",

+ "@@@STEP_LOG_LINE@json.output@ {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"end_time\": 1443438432.949711, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"has_archive\": true, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"perf_test.foo\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }, @@@",

+ "@@@STEP_LOG_LINE@json.output@ {@@@",

+ "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 0, @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"test\": \"page_cycler.foo\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }@@@",

+ "@@@STEP_LOG_LINE@json.output@]@@@",

+ "@@@STEP_LOG_END@json.output@@@"

+ ]

+ },

+ {

"allow_subannotations": true,

"cmd": [

"python",

@@ -864,33 +925,108 @@

"{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"resource_size_builder\", \"buildnumber\": 571, \"internal\": true, \"mastername\": \"chromium.testing.master\", \"patch_url\": \"https://the.patch.url/the.patch\", \"recipe\": \"chromium_android:example\", \"repo_name\": \"src/repo\", \"repo_url\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"slavename\": \"tehslave\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

"--annotate=graphing",

"--results-url=https://chromeperf.appspot.com",

- "--perf-dashboard-id=resource_sizes",

+ "--perf-dashboard-id=page_cycler.foo",

"--perf-id=resource_size_builder",

- "--test-type=resource_sizes",

- "--step-name=resource_sizes",

+ "--test-type=page_cycler.foo",

+ "--step-name=page_cycler.foo",

"--chartjson-file",

"/path/to/tmp/json",

"--builder-name=resource_size_builder",

"--slave-name=tehslave",

"--build-number=571",

"--run-python-script",

- "[SLAVE_BUILD]/src/build/android/resource_sizes.py",

- "[SLAVE_BUILD]/src/out/Release/apks/Chrome.apk",

- "--build_type",

+ "[SLAVE_BUILD]/src/build/android/test_runner.py",

+ "perf",

+ "--print-step",

+ "page_cycler.foo",

+ "--verbose",

+ "--adb-path",

+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",

+ "--blacklist-file",

+ "[SLAVE_BUILD]/src/out/bad_devices.json"

+ ],

+ "env": {

+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",

+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

+ },

+ "name": "page_cycler.foo",

+ "~followup_annotations": [

+ "@@@STEP_TEXT@<br/>Device Affinity: 0<br/>@@@",

+ "@@@STEP_LOG_LINE@json.output@[]@@@",

+ "@@@STEP_LOG_END@json.output@@@",

+ "@@@STEP_LOG_LINE@device affinity@0@@@",

+ "@@@STEP_LOG_END@device affinity@@@"

+ ]

+ },

+ {

+ "allow_subannotations": true,

+ "cmd": [

+ "python",

+ "-u",

+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",

+ "--target",

"Release",

- "--chartjson",

- "--so-path",

- "[SLAVE_BUILD]/src/out/Release/chrome_apk/libs/armeabi-v7a/libchrome.so",

- "--so-with-symbols-path",

- "[SLAVE_BUILD]/src/out/Release/lib/libchrome.so"

+ "--test-platform",

+ "android",

+ "--no-xvfb",

+ "--factory-properties",

+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"resource_size_builder\", \"buildnumber\": 571, \"internal\": true, \"mastername\": \"chromium.testing.master\", \"patch_url\": \"https://the.patch.url/the.patch\", \"recipe\": \"chromium_android:example\", \"repo_name\": \"src/repo\", \"repo_url\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"slavename\": \"tehslave\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

+ "--build-properties",

+ "--annotate=graphing",

+ "--results-url=https://chromeperf.appspot.com",

+ "--perf-dashboard-id=perf_test.foo",

+ "--perf-id=resource_size_builder",

+ "--test-type=perf_test.foo",

+ "--step-name=perf_test.foo",

+ "--chartjson-file",

+ "/path/to/tmp/json",

+ "--builder-name=resource_size_builder",

+ "--slave-name=tehslave",

+ "--build-number=571",

+ "--run-python-script",

+ "[SLAVE_BUILD]/src/build/android/test_runner.py",

+ "perf",

+ "--print-step",

+ "perf_test.foo",

+ "--verbose",

+ "--adb-path",

+ "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",

+ "--blacklist-file",

+ "[SLAVE_BUILD]/src/out/bad_devices.json",

+ "--get-output-dir-archive",

+ "[TMP_BASE]/perf_archives_tmp_1/output_dir.zip"

"env": {

- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"

+ "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",

+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- "name": "resource_sizes",

+ "name": "perf_test.foo",

"~followup_annotations": [

+ "@@@STEP_TEXT@<br/>Device Affinity: 0<br/>@@@",

"@@@STEP_LOG_LINE@json.output@[]@@@",

- "@@@STEP_LOG_END@json.output@@@"

+ "@@@STEP_LOG_END@json.output@@@",

+ "@@@STEP_LOG_LINE@device affinity@0@@@",

+ "@@@STEP_LOG_END@device affinity@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",

+ "--",

+ "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",

+ "----",

+ "cp",

+ "[TMP_BASE]/perf_archives_tmp_1/output_dir.zip",

+ "gs://Bucket/resource_size_builder/perf_test.foo/20150928T110712_build_571.zip"

+ ],

+ "name": "gsutil upload perf_test.foo output dir archive",

+ "~followup_annotations": [

+ "@@@STEP_LINK@output_dir.zip@https://storage.cloud.google.com/Bucket/resource_size_builder/perf_test.foo/20150928T110712_build_571.zip@@@"

]

{