scripts/slave/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Nexus5_WebView_Perf__1_.json - Issue 1777863005: Recipe changes to move webview perf bots to the android/perf recipe

Unified Diff: scripts/slave/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Nexus5_WebView_Perf__1_.json

Issue 1777863005: Recipe changes to move webview perf bots to the android/perf recipe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build

Patch Set: Rebase. Created 4 years, 8 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/android/builder.py ('K') | « scripts/slave/recipes/android/perf.py ('k') | scripts/slave/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Nexus5x_WebView_Perf__1_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Nexus5_WebView_Perf__1_.json

diff --git a/scripts/slave/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__1_.json b/scripts/slave/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Nexus5_WebView_Perf__1_.json

similarity index 89%

copy from scripts/slave/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__1_.json

copy to scripts/slave/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Nexus5_WebView_Perf__1_.json

index f19ff0c45ec6650e3faed29728cf50972da3a38c..722a2e3c3288dce7484a2ff6abf1c1f57c8dee64 100644

--- a/scripts/slave/recipes/android/perf.expected/full_chromium_perf_Android_Nexus7v2_Perf__1_.json

+++ b/scripts/slave/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Nexus5_WebView_Perf__1_.json

@@ -5,9 +5,9 @@

"-u",

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

"--master",

- "chromium.perf",

+ "chromium.perf.fyi",

"--builder",

- "Android Nexus7v2 Perf (1)",

+ "Android Nexus5 WebView Perf (1)",

"--slave",

"slavename",

"--spec",

@@ -125,7 +125,7 @@

"--paths",

"{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",

"--properties",

- "{\"buildername\": \"Android Nexus7v2 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus7v2\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}"

+ "{\"buildername\": \"Android Nexus5 WebView Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}"

"cwd": "[SLAVE_BUILD]",

"name": "get compile targets for scripts",

@@ -375,8 +375,8 @@

"RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",

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

"[\"07a00ca4\"]",

- "chromium.perf",

- "Android Nexus7v2 Perf (1)",

+ "chromium.perf.fyi",

+ "Android Nexus5 WebView Perf (1)",

"--blacklist-file",

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

@@ -386,7 +386,7 @@

{

"cmd": [

"[SLAVE_BUILD]/src/build/android/adb_install_apk.py",

- "ChromePublic.apk",

+ "SystemWebview.apk",

"-v",

"--blacklist-file",

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

@@ -396,7 +396,22 @@

"env": {

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

- "name": "install ChromePublic.apk"

+ "name": "install SystemWebview.apk"

+ },

+ {

+ "cmd": [

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

+ "SystemWebViewShell.apk",

+ "-v",

+ "--blacklist-file",

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

+ "--release"

+ ],

+ "cwd": "[SLAVE_BUILD]",

+ "env": {

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

+ },

+ "name": "install SystemWebViewShell.apk"

{

"cmd": [

@@ -409,7 +424,7 @@

"--json-output",

"/path/to/tmp/json",

"--num-shards",

- "21",

+ "5",

"--device",

"07a00ca4"

@@ -435,11 +450,11 @@

"@@@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\": 3@@@",

"@@@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\": 1, @@@",

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

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

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

@@ -457,7 +472,7 @@

"--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}",

+ "{\"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\"}, \"dromaeo.cssqueryjquery\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 3}, \"dromaeo.cssqueryjquery.release\": {\"cmd\": \"/path/to/run_benchmark\", \"device_affinity\": 1, \"perf_dashboard_id\": \"dromaeo.cssqueryjquery\"}}, \"version\": 2}",

"--blacklist-file",

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

"--collect-chartjson-data",

@@ -480,7 +495,7 @@

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

"perf",

"--steps",

"--output-json-list",

"/path/to/tmp/json",

"--blacklist-file",

@@ -520,18 +535,18 @@

"android",

"--no-xvfb",

"--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Nexus7v2 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": \"parent_buildername\", \"parent_buildnumber\": \"1729\", \"parent_revision\": \"deadbeef\", \"recipe\": \"android/perf\", \"repo_name\": \"src\", \"repo_url\": \"https://chromium.googlesource.com/chromium/src.git\", \"revision\": \"deadbeef\", \"slavename\": \"slavename\", \"target\": \"Release\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Nexus5 WebView Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf.fyi\", \"parent_buildername\": \"parent_buildername\", \"parent_buildnumber\": \"1729\", \"parent_revision\": \"deadbeef\", \"recipe\": \"android/perf\", \"repo_name\": \"src\", \"repo_url\": \"https://chromium.googlesource.com/chromium/src.git\", \"revision\": \"deadbeef\", \"slavename\": \"slavename\", \"target\": \"Release\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

"--build-properties",

"--annotate=graphing",

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

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

- "--perf-id=android-nexus7v2",

+ "--perf-id=android-webview",

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

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

"--chartjson-file",

"/path/to/tmp/json",

- "--builder-name=Android Nexus7v2 Perf (1)",

+ "--builder-name=Android Nexus5 WebView Perf (1)",

"--slave-name=slavename",

"--build-number=571",

"--run-python-script",

@@ -567,18 +582,18 @@

"android",

"--no-xvfb",

"--factory-properties",

"--build-properties",

"--annotate=graphing",

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

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

- "--perf-id=android-nexus7v2",

+ "--perf-id=android-webview",

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

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

"--chartjson-file",

"/path/to/tmp/json",

- "--builder-name=Android Nexus7v2 Perf (1)",

+ "--builder-name=Android Nexus5 WebView Perf (1)",

"--slave-name=slavename",

"--build-number=571",

"--run-python-script",

@@ -641,12 +656,12 @@

"----",

"cp",

"[SLAVE_BUILD]/src/out/Release/full_log",

- "gs://chromium-android/logcat_dumps/Android Nexus7v2 Perf (1)/571"

+ "gs://chromium-android/logcat_dumps/Android Nexus5 WebView Perf (1)/571"

"cwd": "[SLAVE_BUILD]",

"name": "gsutil upload",

"~followup_annotations": [

- "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Nexus7v2 Perf (1)/571@@@"

+ "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Nexus5 WebView Perf (1)/571@@@"

]

{