scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Android_Galaxy_S5_Perf__1_.json - Issue 2259823008: Move chromium.perf.fyi Galaxy S5 Perf from android/perf to chromium recipe.

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Android_Galaxy_S5_Perf__1_.json

Issue 2259823008: Move chromium.perf.fyi Galaxy S5 Perf from android/perf to chromium recipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: Created 4 years, 4 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

« scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json ('K') | « scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Android_Galaxy_S5_Perf__1_.json

diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Galaxy_S5_Perf__1_.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Android_Galaxy_S5_Perf__1_.json

similarity index 82%

copy from scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Galaxy_S5_Perf__1_.json

copy to scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Android_Galaxy_S5_Perf__1_.json

index ddd085609a3ea8cb6cd56f1a79edafcff85d37b4..b1c79c16afe2d236acbcdc44190f08a57f490635 100644

--- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Galaxy_S5_Perf__1_.json

+++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_fyi_Android_Galaxy_S5_Perf__1_.json

@@ -27,7 +27,7 @@

"-u",

"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",

"--master",

- "chromium.perf",

+ "chromium.perf.fyi",

"--builder",

"Android Galaxy S5 Perf (1)",

"--slave",

@@ -281,7 +281,7 @@

"--build-archive-url",

"gs://test-domain/test-archive.zip",

"--master-name",

- "chromium.perf",

+ "chromium.perf.fyi",

"--build-number",

"571"

@@ -530,7 +530,7 @@

"--json-output",

"/path/to/tmp/json",

"--num-shards",

- "21",

+ "1",

"--device",

"07a00ca4"

@@ -545,7 +545,7 @@

"@@@STEP_LOG_LINE@json.output@ \"steps\": {@@@",

"@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.exact\": {@@@",

"@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",

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

"@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.all\"@@@",

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

"@@@STEP_LOG_LINE@json.output@ \"blink_perf.all.release\": {@@@",

@@ -555,16 +555,16 @@

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

"@@@STEP_LOG_LINE@json.output@ \"blink_perf.dom\": {@@@",

"@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 1, @@@",

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

"@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"blink_perf.dom\"@@@",

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

"@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery\": {@@@",

"@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 13@@@",

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

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

"@@@STEP_LOG_LINE@json.output@ \"dromaeo.cssqueryjquery.release\": {@@@",

"@@@STEP_LOG_LINE@json.output@ \"cmd\": \"/path/to/run_benchmark\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"device_affinity\": 11, @@@",

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

"@@@STEP_LOG_LINE@json.output@ \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"@@@",

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

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

@@ -574,68 +574,88 @@

]

{

+ "allow_subannotations": true,

"cmd": [

"python",

"-u",

- "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/build/android/test_runner.py",

- "perf",

- "--release",

- "--verbose",

- "--steps",

- "{\"steps\": {\"blink_perf.all.exact\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.all.release\": {\"cmd\": \"/usr/bin/python /path/to/run_benchmark --a=1 -v --b=2\", \"device_affinity\": 0, \"perf_dashboard_id\": \"blink_perf.all\"}, \"blink_perf.dom\": {\"cmd\": \"/path/to/run_benchmark -v --upload-results blink_perf.dom\", \"device_affinity\": 1, \"perf_dashboard_id\": \"blink_perf.dom\"}}, \"version\": 2}",

- "--blacklist-file",

- "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/out/bad_devices.json",

- "--collect-chartjson-data",

- "--max-battery-temp",

- "350",

- "--known-devices-file",

- "[HOME]/.android/known_devices.json",

- "--adb-path",

- "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/third_party/android_tools/sdk/platform-tools/adb"

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

+ "--target",

+ "Release",

+ "--test-platform",

+ "android",

+ "--xvfb",

+ "--factory-properties",

+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android Galaxy S5 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

+ "--build-properties",

+ "--annotate=graphing",

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

+ "--perf-dashboard-id=blink_perf.all",

+ "--perf-id=fyi-android-galaxy-s5",

+ "--test-type=blink_perf.all",

+ "--step-name=blink_perf.all.exact",

+ "--chartjson-file",

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

+ "--builder-name=Android Galaxy S5 Perf (1)",

+ "--slave-name=TestSlavename",

+ "--build-number=571",

+ "--run-python-script",

+ "/path/to/run_benchmark",

+ "--a=1",

+ "-v",

+ "--b=2"

- "cwd": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src",

+ "cwd": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_",

"env": {

- "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/out/Release",

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

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

- "name": "Sharded Perf Tests"

+ "name": "blink_perf.all.exact",

+ "~followup_annotations": [

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

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

+ ]

{

+ "allow_subannotations": true,

"cmd": [

"python",

"-u",

- "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/build/android/test_runner.py",

- "perf",

- "--steps",

- "--output-json-list",

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

+ "--target",

+ "Release",

+ "--test-platform",

+ "android",

+ "--xvfb",

+ "--factory-properties",

+ "--build-properties",

+ "--annotate=graphing",

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

+ "--perf-dashboard-id=blink_perf.all",

+ "--perf-id=fyi-android-galaxy-s5",

+ "--test-type=blink_perf.all",

+ "--step-name=blink_perf.all.release",

+ "--chartjson-file",

"/path/to/tmp/json",

- "--blacklist-file",

- "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/out/bad_devices.json",

- "--adb-path",

- "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/third_party/android_tools/sdk/platform-tools/adb"

+ "--builder-name=Android Galaxy S5 Perf (1)",

+ "--slave-name=TestSlavename",

+ "--build-number=571",

+ "--run-python-script",

+ "/path/to/run_benchmark",

+ "--a=1",

+ "-v",

+ "--b=2"

"cwd": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_",

"env": {

- "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/out/Release",

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

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

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

+ "name": "blink_perf.all.release",

"~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_LINE@json.output@[]@@@",

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

]

@@ -649,42 +669,34 @@

"Release",

"--test-platform",

"android",

- "--no-xvfb",

+ "--xvfb",

"--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android Galaxy S5 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_buildername\": \"Android Builder\", \"parent_got_revision\": \"1111111\", \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

"--build-properties",

"--annotate=graphing",

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

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

- "--perf-id=android-galaxy-s5",

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

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

+ "--perf-dashboard-id=blink_perf.dom",

+ "--perf-id=fyi-android-galaxy-s5",

+ "--test-type=blink_perf.dom",

+ "--step-name=blink_perf.dom",

"--chartjson-file",

"/path/to/tmp/json",

"--builder-name=Android Galaxy S5 Perf (1)",

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

- "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/build/android/test_runner.py",

- "perf",

- "--print-step",

- "page_cycler.foo",

- "--verbose",

- "--adb-path",

- "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/third_party/android_tools/sdk/platform-tools/adb",

- "--blacklist-file",

- "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/out/bad_devices.json"

+ "-v",

+ "--upload-results",

+ "blink_perf.dom"

"cwd": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_",

"env": {

- "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/out/Release",

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

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

- "name": "page_cycler.foo",

+ "name": "blink_perf.dom",

"~followup_annotations": [

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

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

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

]

@@ -699,42 +711,72 @@

"Release",

"--test-platform",

"android",

- "--no-xvfb",

+ "--xvfb",

"--factory-properties",

"--build-properties",

"--annotate=graphing",

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

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

- "--perf-id=android-galaxy-s5",

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

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

+ "--perf-dashboard-id=dromaeo.cssqueryjquery",

+ "--perf-id=fyi-android-galaxy-s5",

+ "--test-type=dromaeo.cssqueryjquery",

+ "--step-name=dromaeo.cssqueryjquery",

"--chartjson-file",

"/path/to/tmp/json",

"--builder-name=Android Galaxy S5 Perf (1)",

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

- "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/build/android/test_runner.py",

- "perf",

- "--print-step",

- "perf_test.foo",

- "--verbose",

- "--adb-path",

- "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/third_party/android_tools/sdk/platform-tools/adb",

- "--blacklist-file",

- "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/out/bad_devices.json"

+ "/path/to/run_benchmark"

+ ],

+ "cwd": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_",

+ "env": {

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

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

+ },

+ "name": "dromaeo.cssqueryjquery",

+ "~followup_annotations": [

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

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

+ ]

+ },

+ {

+ "allow_subannotations": true,

+ "cmd": [

+ "python",

+ "-u",

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

+ "--target",

+ "Release",

+ "--test-platform",

+ "android",

+ "--xvfb",

+ "--factory-properties",

+ "--build-properties",

+ "--annotate=graphing",

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

+ "--perf-dashboard-id=dromaeo.cssqueryjquery",

+ "--perf-id=fyi-android-galaxy-s5",

+ "--test-type=dromaeo.cssqueryjquery",

+ "--step-name=dromaeo.cssqueryjquery.release",

+ "--chartjson-file",

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

+ "--builder-name=Android Galaxy S5 Perf (1)",

+ "--slave-name=TestSlavename",

+ "--build-number=571",

+ "--run-python-script",

+ "/path/to/run_benchmark"

"cwd": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_",

"env": {

- "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android_Galaxy_S5_Perf__1_/src/out/Release",

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

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

- "name": "perf_test.foo",

+ "name": "dromaeo.cssqueryjquery.release",

"~followup_annotations": [

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

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

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

]