| Index: scripts/slave/recipes/android/builder.expected/full_chromium_perf_Android_Builder.json
|
| diff --git a/scripts/slave/recipes/android/builder.expected/full_chromium_perf_Android_Builder.json b/scripts/slave/recipes/android/builder.expected/full_chromium_perf_Android_Builder.json
|
| index f4133aef000d276d5ea222f89eac1ce6df087df8..d53ae0cb7494b5590da0b7e174ef0e9dae9de96e 100644
|
| --- a/scripts/slave/recipes/android/builder.expected/full_chromium_perf_Android_Builder.json
|
| +++ b/scripts/slave/recipes/android/builder.expected/full_chromium_perf_Android_Builder.json
|
| @@ -286,6 +286,332 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| + "perf",
|
| + "--release",
|
| + "--verbose",
|
| + "--steps",
|
| + "{\"steps\": {\"resource_sizes (ChromePublic.apk)\": {\"archive_output_dir\": true, \"cmd\": \"build/android/resource_sizes.py '[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.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"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| + "perf",
|
| + "--steps",
|
| + "{\"steps\": {\"resource_sizes (ChromePublic.apk)\": {\"archive_output_dir\": true, \"cmd\": \"build/android/resource_sizes.py '[SLAVE_BUILD]/src/out/Release/apks/ChromePublic.apk' --chartjson\", \"device_affinity\": null}}, \"version\": 1}",
|
| + "--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",
|
| + "-u",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--test-platform",
|
| + "android",
|
| + "--no-xvfb",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 257, \"got_revision\": \"267739\", \"issue\": \"8675309\", \"mastername\": \"chromium.perf\", \"patchset\": \"1\", \"recipe\": \"android/builder\", \"repository\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"267739\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 257, \"got_revision\": \"267739\", \"issue\": \"8675309\", \"mastername\": \"chromium.perf\", \"patchset\": \"1\", \"recipe\": \"android/builder\", \"repository\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"267739\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--annotate=graphing",
|
| + "--results-url=https://chromeperf.appspot.com",
|
| + "--perf-dashboard-id=page_cycler.foo",
|
| + "--perf-id=Android Builder",
|
| + "--test-type=page_cycler.foo",
|
| + "--step-name=page_cycler.foo",
|
| + "--chartjson-file",
|
| + "/path/to/tmp/json",
|
| + "--builder-name=Android Builder",
|
| + "--slave-name=TestSlavename",
|
| + "--build-number=257",
|
| + "--run-python-script",
|
| + "[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",
|
| + "--test-platform",
|
| + "android",
|
| + "--no-xvfb",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 257, \"got_revision\": \"267739\", \"issue\": \"8675309\", \"mastername\": \"chromium.perf\", \"patchset\": \"1\", \"recipe\": \"android/builder\", \"repository\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"267739\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 257, \"got_revision\": \"267739\", \"issue\": \"8675309\", \"mastername\": \"chromium.perf\", \"patchset\": \"1\", \"recipe\": \"android/builder\", \"repository\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"267739\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--annotate=graphing",
|
| + "--results-url=https://chromeperf.appspot.com",
|
| + "--perf-dashboard-id=perf_test.foo",
|
| + "--perf-id=Android Builder",
|
| + "--test-type=perf_test.foo",
|
| + "--step-name=perf_test.foo",
|
| + "--chartjson-file",
|
| + "/path/to/tmp/json",
|
| + "--builder-name=Android Builder",
|
| + "--slave-name=TestSlavename",
|
| + "--build-number=257",
|
| + "--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"
|
| + ],
|
| + "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": "perf_test.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@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| + "perf",
|
| + "--release",
|
| + "--verbose",
|
| + "--steps",
|
| + "{\"steps\": {\"resource_sizes (SystemWebView.apk)\": {\"archive_output_dir\": true, \"cmd\": \"build/android/resource_sizes.py '[SLAVE_BUILD]/src/out/Release/apks/SystemWebView.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 (2)"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| + "perf",
|
| + "--steps",
|
| + "{\"steps\": {\"resource_sizes (SystemWebView.apk)\": {\"archive_output_dir\": true, \"cmd\": \"build/android/resource_sizes.py '[SLAVE_BUILD]/src/out/Release/apks/SystemWebView.apk' --chartjson\", \"device_affinity\": null}}, \"version\": 1}",
|
| + "--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 (2)",
|
| + "~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",
|
| + "-u",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--test-platform",
|
| + "android",
|
| + "--no-xvfb",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 257, \"got_revision\": \"267739\", \"issue\": \"8675309\", \"mastername\": \"chromium.perf\", \"patchset\": \"1\", \"recipe\": \"android/builder\", \"repository\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"267739\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 257, \"got_revision\": \"267739\", \"issue\": \"8675309\", \"mastername\": \"chromium.perf\", \"patchset\": \"1\", \"recipe\": \"android/builder\", \"repository\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"267739\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--annotate=graphing",
|
| + "--results-url=https://chromeperf.appspot.com",
|
| + "--perf-dashboard-id=page_cycler.foo",
|
| + "--perf-id=Android Builder",
|
| + "--test-type=page_cycler.foo",
|
| + "--step-name=page_cycler.foo",
|
| + "--chartjson-file",
|
| + "/path/to/tmp/json",
|
| + "--builder-name=Android Builder",
|
| + "--slave-name=TestSlavename",
|
| + "--build-number=257",
|
| + "--run-python-script",
|
| + "[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 (2)",
|
| + "~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",
|
| + "--test-platform",
|
| + "android",
|
| + "--no-xvfb",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 257, \"got_revision\": \"267739\", \"issue\": \"8675309\", \"mastername\": \"chromium.perf\", \"patchset\": \"1\", \"recipe\": \"android/builder\", \"repository\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"267739\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 257, \"got_revision\": \"267739\", \"issue\": \"8675309\", \"mastername\": \"chromium.perf\", \"patchset\": \"1\", \"recipe\": \"android/builder\", \"repository\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"267739\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--annotate=graphing",
|
| + "--results-url=https://chromeperf.appspot.com",
|
| + "--perf-dashboard-id=perf_test.foo",
|
| + "--perf-id=Android Builder",
|
| + "--test-type=perf_test.foo",
|
| + "--step-name=perf_test.foo",
|
| + "--chartjson-file",
|
| + "/path/to/tmp/json",
|
| + "--builder-name=Android Builder",
|
| + "--slave-name=TestSlavename",
|
| + "--build-number=257",
|
| + "--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"
|
| + ],
|
| + "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": "perf_test.foo (2)",
|
| + "~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@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/archive_build.py",
|
| "--target",
|
| "Release",
|
|
|