| Index: scripts/slave/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Nexus5x_WebView_Perf__2_.json
|
| diff --git a/scripts/slave/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__2_.json b/scripts/slave/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Nexus5x_WebView_Perf__2_.json
|
| similarity index 90%
|
| copy from scripts/slave/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__2_.json
|
| copy to scripts/slave/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Nexus5x_WebView_Perf__2_.json
|
| index d0a8ccdbad6fb9f108fcd4b797180ef47b291b97..b7ad6c4704bdaa5572eb5fff16023c741a048789 100644
|
| --- a/scripts/slave/recipes/android/perf.expected/full_chromium_perf_Android_Nexus5_Perf__2_.json
|
| +++ b/scripts/slave/recipes/android/perf.expected/full_chromium_perf_fyi_Android_Nexus5x_WebView_Perf__2_.json
|
| @@ -5,9 +5,9 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| - "chromium.perf",
|
| + "chromium.perf.fyi",
|
| "--builder",
|
| - "Android Nexus5 Perf (2)",
|
| + "Android Nexus5x WebView Perf (2)",
|
| "--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 Nexus5 Perf (2)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}"
|
| + "{\"buildername\": \"Android Nexus5x WebView Perf (2)\", \"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 Nexus5 Perf (2)",
|
| + "chromium.perf.fyi",
|
| + "Android Nexus5x WebView Perf (2)",
|
| "--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",
|
| + "14",
|
| "--device",
|
| "07a00ca4"
|
| ],
|
| @@ -520,18 +535,18 @@
|
| "android",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Nexus5 Perf (2)\", \"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 Nexus5x WebView Perf (2)\", \"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",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Nexus5 Perf (2)\", \"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 Nexus5x WebView Perf (2)\", \"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\"}",
|
| "--annotate=graphing",
|
| "--results-url=https://chromeperf.appspot.com",
|
| "--perf-dashboard-id=page_cycler.foo",
|
| - "--perf-id=android-nexus5",
|
| + "--perf-id=android-webview-nexus5X",
|
| "--test-type=page_cycler.foo",
|
| "--step-name=page_cycler.foo",
|
| "--chartjson-file",
|
| "/path/to/tmp/json",
|
| - "--builder-name=Android Nexus5 Perf (2)",
|
| + "--builder-name=Android Nexus5x WebView Perf (2)",
|
| "--slave-name=slavename",
|
| "--build-number=571",
|
| "--run-python-script",
|
| @@ -567,18 +582,18 @@
|
| "android",
|
| "--no-xvfb",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Nexus5 Perf (2)\", \"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 Nexus5x WebView Perf (2)\", \"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",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Nexus5 Perf (2)\", \"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 Nexus5x WebView Perf (2)\", \"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\"}",
|
| "--annotate=graphing",
|
| "--results-url=https://chromeperf.appspot.com",
|
| "--perf-dashboard-id=perf_test.foo",
|
| - "--perf-id=android-nexus5",
|
| + "--perf-id=android-webview-nexus5X",
|
| "--test-type=perf_test.foo",
|
| "--step-name=perf_test.foo",
|
| "--chartjson-file",
|
| "/path/to/tmp/json",
|
| - "--builder-name=Android Nexus5 Perf (2)",
|
| + "--builder-name=Android Nexus5x WebView Perf (2)",
|
| "--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 Nexus5 Perf (2)/571"
|
| + "gs://chromium-android/logcat_dumps/Android Nexus5x WebView Perf (2)/571"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| - "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Nexus5 Perf (2)/571@@@"
|
| + "@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Nexus5x WebView Perf (2)/571@@@"
|
| ]
|
| },
|
| {
|
|
|