| Index: scripts/slave/recipe_modules/chromium_android/example.expected/use_devil_adb_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/use_devil_adb_basic.json
|
| similarity index 83%
|
| copy from scripts/slave/recipe_modules/chromium_android/example.expected/resource_size_builder_basic.json
|
| copy to scripts/slave/recipe_modules/chromium_android/example.expected/use_devil_adb_basic.json
|
| index 0a77e8d4029113b396393a1c5298edb64e7dd0c7..29f56fd241f85124750474db9ff1a30e9b54d694 100644
|
| --- a/scripts/slave/recipe_modules/chromium_android/example.expected/resource_size_builder_basic.json
|
| +++ b/scripts/slave/recipe_modules/chromium_android/example.expected/use_devil_adb_basic.json
|
| @@ -815,278 +815,323 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "monkey",
|
| - "-v",
|
| - "--package=chrome",
|
| - "--event-count=50000",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| - "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "\nimport sys\nsys.path.append(sys.argv[1])\nfrom devil import devil_env\ndevil_env.config.Initialize()\ndevil_env.config.PrefetchPaths(dependencies=['adb'])\n",
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil"
|
| ],
|
| - "env": {
|
| - "BUILDTYPE": "Release",
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| - },
|
| - "name": "Monkey Test"
|
| + "name": "initialize devil",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@sys.path.append(sys.argv[1])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@from devil import devil_env@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@devil_env.config.Initialize()@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@devil_env.config.PrefetchPaths(dependencies=['adb'])@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "instrumentation",
|
| - "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| - "--flakiness-dashboard-server",
|
| - "test-results.appspot.com",
|
| - "-A",
|
| - "SmallTest",
|
| - "-E",
|
| - "FlakyTest",
|
| - "--screenshot",
|
| - "--test-apk",
|
| - "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.apk",
|
| - "--apk-under-test",
|
| - "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",
|
| - "--additional-apk",
|
| - "Additional.apk",
|
| - "--isolate-file-path",
|
| - "android_webview/android_webview_test_data.isolate",
|
| - "--release",
|
| - "--official-build",
|
| - "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[SLAVE_BUILD]/src/build/symlink.py",
|
| + "-f",
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
|
| + "~/adb"
|
| + ],
|
| + "name": "create adb symlink"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
|
| + "--",
|
| + "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
| + "[SLAVE_BUILD]/src/out/logcat",
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/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": "SmallTest"
|
| + "name": "spawn_logcat_monitor (2)"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_unittests",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
|
| + "--action",
|
| + "restart",
|
| + "--pid-file-path",
|
| + "/tmp/device_monitor.pid",
|
| + "--",
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py",
|
| + "--adb-path",
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| + ],
|
| + "name": "spawn_device_monitor"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
|
| "--verbose",
|
| - "--isolate_file_path=[SLAVE_BUILD]/src/some_file.isolate",
|
| - "--gtest_filter=WebRtc*",
|
| - "--tool=asan",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
|
| ],
|
| "env": {
|
| "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": "unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "[SLAVE_BUILD]/src/tools/prepare-bisect-perf-regression.py",
|
| - "-w",
|
| - "[SLAVE_BUILD]"
|
| - ],
|
| - "name": "prepare bisect perf regression"
|
| + "name": "authorize_adb_devices (2)"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/tools/run-bisect-perf-regression.py",
|
| - "-w",
|
| - "[SLAVE_BUILD]",
|
| - "--extra_src",
|
| - "test.py",
|
| - "--path_to_config",
|
| - "test.py"
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
|
| + "--blacklist-file",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--known-devices-file",
|
| + "[HOME]/.android/known_devices.json",
|
| + "--adb-path",
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
|
| + "-v"
|
| ],
|
| - "name": "run bisect perf regression"
|
| + "env": {
|
| + "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": "device_recovery (4)"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "perf",
|
| - "--release",
|
| - "--verbose",
|
| - "--steps",
|
| - "{\"steps\": {\"resource_sizes (Example.apk)\": {\"archive_output_dir\": true, \"cmd\": \"build/android/resource_sizes.py '[SLAVE_BUILD]/src/out/Release/apks/Example.apk' --chartjson\", \"device_affinity\": null}}, \"version\": 1}",
|
| + "[SLAVE_BUILD]/src/build/android/provision_devices.py",
|
| + "--adb-path",
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| - "--num-retries",
|
| - "0",
|
| - "--collect-chartjson-data",
|
| - "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "--output-device-blacklist",
|
| + "/path/to/tmp/json",
|
| + "-t",
|
| + "Release"
|
| ],
|
| - "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"
|
| + "name": "provision_devices (3)"
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| - "perf",
|
| - "--steps",
|
| - "{\"steps\": {\"resource_sizes (Example.apk)\": {\"archive_output_dir\": true, \"cmd\": \"build/android/resource_sizes.py '[SLAVE_BUILD]/src/out/Release/apks/Example.apk' --chartjson\", \"device_affinity\": null}}, \"version\": 1}",
|
| - "--output-json-list",
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_status.py",
|
| + "--json-output",
|
| "/path/to/tmp/json",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--known-devices-file",
|
| + "[HOME]/.android/known_devices.json",
|
| + "--buildbot-path",
|
| + "/home/chrome-bot/.adb_device_info",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
|
| + "-v",
|
| + "--overwrite-known-devices-files"
|
| ],
|
| "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",
|
| + "name": "device_status (4)",
|
| "~followup_annotations": [
|
| + "@@@STEP_TEXT@Online devices: 1@@@",
|
| "@@@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@ \"adb_status\": \"device\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"battery\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"AC powered\": \"false\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"USB powered\": \"true\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Wireless powered\": \"false\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"health\": \"2\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"level\": \"100\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"present\": \"true\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"scale\": \"100\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"status\": \"5\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"technology\": \"Li-ion\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"temperature\": \"249\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"voltage\": \"4286\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": false, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"build_detail\": \"google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"imei_slice\": \"Unknown\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"ro.build.id\": \"LRX21O\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"ro.build.product\": \"product_name\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"serial\": \"07a00ca4\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"usb_status\": true, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"wifi_ip\": \"\"@@@",
|
| "@@@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@ \"adb_status\": \"offline\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": true, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"serial\": \"03e0363a003c6ad4\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"usb_status\": false@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"unauthorized\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": true, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"serial\": \"03e0363a003c6ad5\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"usb_status\": true@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"adb_status\": \"device\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"blacklisted\": true, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"serial\": \"03e0363a003c6ad6\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"usb_status\": true@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| "@@@STEP_LOG_LINE@json.output@]@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| + "@@@STEP_LOG_END@json.output@@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@{@@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"adb_status\": \"device\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"battery\": {@@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"AC powered\": \"false\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"USB powered\": \"true\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"Wireless powered\": \"false\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"health\": \"2\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"level\": \"100\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"present\": \"true\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"scale\": \"100\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"status\": \"5\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"technology\": \"Li-ion\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"temperature\": \"249\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"voltage\": \"4286\"@@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ }, @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"blacklisted\": false, @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"build_detail\": \"google/razor/flo:5.0/LRX21O/1570415:userdebug/dev-keys\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"imei_slice\": \"Unknown\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"ro.build.id\": \"LRX21O\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"ro.build.product\": \"product_name\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"serial\": \"07a00ca4\", @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"usb_status\": true, @@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@ \"wifi_ip\": \"\"@@@",
|
| + "@@@STEP_LOG_LINE@product_name LRX21O 07a00ca4@}@@@",
|
| + "@@@STEP_LOG_END@product_name LRX21O 07a00ca4@@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@{@@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@ \"adb_status\": \"offline\", @@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@ \"blacklisted\": true, @@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@ \"serial\": \"03e0363a003c6ad4\", @@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@ \"usb_status\": false@@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad4: missing@}@@@",
|
| + "@@@STEP_LOG_END@03e0363a003c6ad4: missing@@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@{@@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@ \"adb_status\": \"unauthorized\", @@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@ \"blacklisted\": true, @@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@ \"serial\": \"03e0363a003c6ad5\", @@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@ \"usb_status\": true@@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad5: adb status unauthorized@}@@@",
|
| + "@@@STEP_LOG_END@03e0363a003c6ad5: adb status unauthorized@@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@{@@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"adb_status\": \"device\", @@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"blacklisted\": true, @@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"serial\": \"03e0363a003c6ad6\", @@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@ \"usb_status\": true@@@",
|
| + "@@@STEP_LOG_LINE@03e0363a003c6ad6: blacklisted@}@@@",
|
| + "@@@STEP_LOG_END@03e0363a003c6ad6: blacklisted@@@"
|
| ]
|
| },
|
| {
|
| - "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\": \"resource_size_builder\", \"buildnumber\": 571, \"internal\": true, \"issue\": \"123456789\", \"mastername\": \"chromium.testing.master\", \"patchset\": \"1\", \"recipe\": \"chromium_android:example\", \"repo_name\": \"src/repo\", \"repo_url\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"rietveld\": \"http://rietveld.example.com\", \"slavename\": \"tehslave\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"resource_size_builder\", \"buildnumber\": 571, \"internal\": true, \"issue\": \"123456789\", \"mastername\": \"chromium.testing.master\", \"patchset\": \"1\", \"recipe\": \"chromium_android:example\", \"repo_name\": \"src/repo\", \"repo_url\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"rietveld\": \"http://rietveld.example.com\", \"slavename\": \"tehslave\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--annotate=graphing",
|
| - "--results-url=https://chromeperf.appspot.com",
|
| - "--perf-dashboard-id=page_cycler.foo",
|
| - "--perf-id=resource_size_builder",
|
| - "--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/test_runner.py",
|
| - "perf",
|
| - "--print-step",
|
| - "page_cycler.foo",
|
| - "--verbose",
|
| - "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "monkey",
|
| + "-v",
|
| + "--package=chrome",
|
| + "--event-count=50000",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--adb-path",
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/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"
|
| + "BUILDTYPE": "Release",
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| - "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@@@"
|
| - ]
|
| + "name": "Monkey Test"
|
| },
|
| {
|
| - "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\": \"resource_size_builder\", \"buildnumber\": 571, \"internal\": true, \"issue\": \"123456789\", \"mastername\": \"chromium.testing.master\", \"patchset\": \"1\", \"recipe\": \"chromium_android:example\", \"repo_name\": \"src/repo\", \"repo_url\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"rietveld\": \"http://rietveld.example.com\", \"slavename\": \"tehslave\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"resource_size_builder\", \"buildnumber\": 571, \"internal\": true, \"issue\": \"123456789\", \"mastername\": \"chromium.testing.master\", \"patchset\": \"1\", \"recipe\": \"chromium_android:example\", \"repo_name\": \"src/repo\", \"repo_url\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00\", \"rietveld\": \"http://rietveld.example.com\", \"slavename\": \"tehslave\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--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",
|
| + "instrumentation",
|
| + "--blacklist-file",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "--flakiness-dashboard-server",
|
| + "test-results.appspot.com",
|
| + "-A",
|
| + "SmallTest",
|
| + "-E",
|
| + "FlakyTest",
|
| + "--screenshot",
|
| + "--test-apk",
|
| + "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.apk",
|
| + "--apk-under-test",
|
| + "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",
|
| + "--additional-apk",
|
| + "Additional.apk",
|
| + "--isolate-file-path",
|
| + "android_webview/android_webview_test_data.isolate",
|
| + "--release",
|
| + "--official-build",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
|
| + ],
|
| + "env": {
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| + },
|
| + "name": "SmallTest"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_unittests",
|
| "--blacklist-file",
|
| "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| - "--get-output-dir-archive",
|
| - "[TMP_BASE]/perf_archives_tmp_1/output_dir.zip"
|
| + "--verbose",
|
| + "--isolate_file_path=[SLAVE_BUILD]/src/some_file.isolate",
|
| + "--gtest_filter=WebRtc*",
|
| + "--tool=asan",
|
| + "--adb-path",
|
| + "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/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": "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@@@"
|
| - ]
|
| + "name": "unittests"
|
| },
|
| {
|
| "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"
|
| + "[SLAVE_BUILD]/src/tools/prepare-bisect-perf-regression.py",
|
| + "-w",
|
| + "[SLAVE_BUILD]"
|
| ],
|
| - "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@@@"
|
| - ]
|
| + "name": "prepare bisect perf regression"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "[SLAVE_BUILD]/src/tools/run-bisect-perf-regression.py",
|
| + "-w",
|
| + "[SLAVE_BUILD]",
|
| + "--extra_src",
|
| + "test.py",
|
| + "--path_to_config",
|
| + "test.py"
|
| + ],
|
| + "name": "run bisect perf regression"
|
| },
|
| {
|
| "cmd": [
|
|
|