| Index: scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_dbg.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_dbg.json
|
| index 11ff86ee33f8fc99bb7517a7188b12ceca9e3618..fd1c9763851fc23de56f06a3ec0120a9cba35c9c 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_dbg.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/tryserver_webrtc_android_dbg.json
|
| @@ -3,6 +3,28 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| + "[BUILDER_CACHE]/android_dbg",
|
| + "511"
|
| + ],
|
| + "name": "makedirs checkout path",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| "tryserver.webrtc",
|
| @@ -30,6 +52,7 @@
|
| "src@12345",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_dbg",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -66,7 +89,7 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
|
| - "[SLAVE_BUILD]/src/out"
|
| + "[BUILDER_CACHE]/android_dbg/src/out"
|
| ],
|
| "name": "clean test output files"
|
| },
|
| @@ -75,10 +98,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",
|
| - "[SLAVE_BUILD]/src/out/Debug/debug_info_dumps",
|
| - "[SLAVE_BUILD]/src/out/Debug/test_logs",
|
| - "[SLAVE_BUILD]/src/out/build_product.zip",
|
| - "[SLAVE_BUILD]/src"
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/debug_info_dumps",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/test_logs",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/build_product.zip",
|
| + "[BUILDER_CACHE]/android_dbg/src"
|
| ],
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| @@ -158,12 +181,12 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/android_dbg/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -182,9 +205,11 @@
|
| "--target",
|
| "Debug",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| + "[BUILDER_CACHE]/android_dbg/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| + "--goma-deps-cache-dir",
|
| + "[GOMA_DEPS_CACHE]",
|
| "--compiler",
|
| "goma",
|
| "--goma-jsonstatus",
|
| @@ -199,7 +224,7 @@
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "compile",
|
| "~followup_annotations": [
|
| @@ -211,9 +236,9 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/symlink.py",
|
| + "[BUILDER_CACHE]/android_dbg/src/build/symlink.py",
|
| "-f",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "~/adb"
|
| ],
|
| "name": "create adb symlink"
|
| @@ -222,13 +247,13 @@
|
| "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/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/build/android/adb_logcat_monitor.py",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/logcat",
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "spawn_logcat_monitor"
|
| },
|
| @@ -239,28 +264,28 @@
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "authorize_adb_devices"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--known-devices-file",
|
| "[HOME]/.android/known_devices.json",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "-v"
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "device_recovery"
|
| },
|
| @@ -268,11 +293,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/provision_devices.py",
|
| + "[BUILDER_CACHE]/android_dbg/src/build/android/provision_devices.py",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--output-device-blacklist",
|
| "/path/to/tmp/json",
|
| "-t",
|
| @@ -280,29 +305,29 @@
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "provision_devices"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_status.py",
|
| + "[BUILDER_CACHE]/android_dbg/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",
|
| + "[BUILDER_CACHE]/android_dbg/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",
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "-v",
|
| "--overwrite-known-devices-files"
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "device_status",
|
| "~followup_annotations": [
|
| @@ -411,10 +436,10 @@
|
| "/tmp/device_monitor.pid",
|
| "--",
|
| "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "[\"07a00ca4\"]",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json"
|
| ],
|
| "name": "spawn_device_monitor"
|
| },
|
| @@ -422,16 +447,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_audio_decoder_unittests",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_audio_decoder_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "audio_decoder_unittests"
|
| },
|
| @@ -439,16 +464,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_common_audio_unittests",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_common_audio_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "common_audio_unittests"
|
| },
|
| @@ -456,16 +481,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_common_video_unittests",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_common_video_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "common_video_unittests"
|
| },
|
| @@ -473,16 +498,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_modules_tests",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_modules_tests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "modules_tests"
|
| },
|
| @@ -490,16 +515,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_modules_unittests",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_modules_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "modules_unittests"
|
| },
|
| @@ -507,16 +532,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_peerconnection_unittests",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_peerconnection_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "peerconnection_unittests"
|
| },
|
| @@ -524,16 +549,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_rtc_unittests",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_rtc_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "rtc_unittests"
|
| },
|
| @@ -541,16 +566,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_system_wrappers_unittests",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_system_wrappers_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "system_wrappers_unittests"
|
| },
|
| @@ -558,16 +583,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_test_support_unittests",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_test_support_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "test_support_unittests"
|
| },
|
| @@ -575,16 +600,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_tools_unittests",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_tools_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "tools_unittests"
|
| },
|
| @@ -592,16 +617,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_video_engine_tests",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_video_engine_tests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "video_engine_tests"
|
| },
|
| @@ -609,16 +634,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_voice_engine_unittests",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_voice_engine_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "voice_engine_unittests"
|
| },
|
| @@ -626,16 +651,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_webrtc_nonparallel_tests",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_webrtc_nonparallel_tests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "webrtc_nonparallel_tests"
|
| },
|
| @@ -643,12 +668,12 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_AppRTCDemoTest",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_AppRTCDemoTest",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| "name": "AppRTCDemoTest"
|
| },
|
| @@ -656,12 +681,12 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Debug/bin/run_libjingle_peerconnection_android_unittest",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/bin/run_libjingle_peerconnection_android_unittest",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| "name": "libjingle_peerconnection_android_unittest"
|
| },
|
| @@ -681,10 +706,10 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
| + "[BUILDER_CACHE]/android_dbg/src/build/android/adb_logcat_printer.py",
|
| "--output-path",
|
| - "[SLAVE_BUILD]/src/out/Debug/full_log",
|
| - "[SLAVE_BUILD]/src/out/logcat"
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/full_log",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/logcat"
|
| ],
|
| "name": "logcat_dump"
|
| },
|
| @@ -703,7 +728,7 @@
|
| "cp",
|
| "-a",
|
| "public-read",
|
| - "[SLAVE_BUILD]/src/out/Debug/full_log",
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/full_log",
|
| "gs://chromium-android/logcat_dumps/android_dbg/1337"
|
| ],
|
| "name": "gsutil upload",
|
| @@ -713,32 +738,32 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_platform/development/scripts/stack",
|
| "--arch",
|
| "arm",
|
| "--more-info",
|
| - "[SLAVE_BUILD]/src/out/Debug/full_log"
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/full_log"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| + "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_dbg/src/out/Debug",
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_with_logcat_dump"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/tombstones.py",
|
| + "[BUILDER_CACHE]/android_dbg/src/build/android/tombstones.py",
|
| "-a",
|
| "-s",
|
| "-w",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Debug",
|
| + "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_dbg/src/out/Debug",
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_dbg/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_dbg/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_for_tombstones"
|
| },
|
| @@ -747,7 +772,7 @@
|
| "python",
|
| "-u",
|
| "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
|
| - "[SLAVE_BUILD]/src/out/Debug/test_logs/*.log"
|
| + "[BUILDER_CACHE]/android_dbg/src/out/Debug/test_logs/*.log"
|
| ],
|
| "name": "test_report",
|
| "~followup_annotations": [
|
|
|