| Index: scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.json
|
| diff --git a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.json b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.json
|
| index 80cd14056a2b3be6b1af6b8df31b7b8fad53c2f9..288cea8dc53b81d732875250d2b5f145a9cda3ad 100644
|
| --- a/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.json
|
| +++ b/scripts/slave/recipes/webrtc/standalone.expected/client_webrtc_android64_tests__l_nexus9_.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]/Android64_Tests__L_Nexus9_",
|
| + "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",
|
| "client.webrtc",
|
| @@ -24,6 +46,7 @@
|
| "src@12345",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -60,7 +83,7 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::webrtc]/resources/cleanup_files.py",
|
| - "[SLAVE_BUILD]/src/out"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out"
|
| ],
|
| "name": "clean test output files"
|
| },
|
| @@ -69,10 +92,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/Release/debug_info_dumps",
|
| - "[SLAVE_BUILD]/src/out/Release/test_logs",
|
| - "[SLAVE_BUILD]/src/out/build_product.zip",
|
| - "[SLAVE_BUILD]/src"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/debug_info_dumps",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/test_logs",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/build_product.zip",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src"
|
| ],
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| @@ -152,12 +175,12 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm64 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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -166,7 +189,7 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[SLAVE_BUILD]/src/out/Release"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release"
|
| ],
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| @@ -193,7 +216,7 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src",
|
| "--build-url",
|
| "gs://chromium-webrtc/client.webrtc/Android64 Builder/full-build-linux.zip",
|
| "--build_revision",
|
| @@ -209,9 +232,9 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/symlink.py",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/symlink.py",
|
| "-f",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "~/adb"
|
| ],
|
| "name": "create adb symlink"
|
| @@ -220,13 +243,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]/Android64_Tests__L_Nexus9_/src/build/android/adb_logcat_monitor.py",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/logcat",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "spawn_logcat_monitor"
|
| },
|
| @@ -237,28 +260,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]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "device_recovery"
|
| },
|
| @@ -266,11 +289,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/provision_devices.py",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android/provision_devices.py",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--output-device-blacklist",
|
| "/path/to/tmp/json",
|
| "-t",
|
| @@ -278,29 +301,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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "provision_devices"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_status.py",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "device_status",
|
| "~followup_annotations": [
|
| @@ -409,10 +432,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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "[\"07a00ca4\"]",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json"
|
| ],
|
| "name": "spawn_device_monitor"
|
| },
|
| @@ -420,16 +443,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_audio_decoder_unittests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_audio_decoder_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "audio_decoder_unittests"
|
| },
|
| @@ -437,16 +460,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_common_audio_unittests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_common_audio_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "common_audio_unittests"
|
| },
|
| @@ -454,16 +477,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_common_video_unittests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_common_video_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "common_video_unittests"
|
| },
|
| @@ -471,16 +494,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_modules_tests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_modules_tests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "modules_tests"
|
| },
|
| @@ -488,16 +511,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_modules_unittests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_modules_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "modules_unittests"
|
| },
|
| @@ -505,16 +528,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_peerconnection_unittests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_peerconnection_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "peerconnection_unittests"
|
| },
|
| @@ -522,16 +545,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_rtc_unittests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_rtc_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "rtc_unittests"
|
| },
|
| @@ -539,16 +562,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_system_wrappers_unittests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_system_wrappers_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "system_wrappers_unittests"
|
| },
|
| @@ -556,16 +579,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_test_support_unittests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_test_support_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "test_support_unittests"
|
| },
|
| @@ -573,16 +596,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_tools_unittests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_tools_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "tools_unittests"
|
| },
|
| @@ -590,16 +613,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_video_engine_tests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_video_engine_tests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "video_engine_tests"
|
| },
|
| @@ -607,16 +630,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_voice_engine_unittests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_voice_engine_unittests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "voice_engine_unittests"
|
| },
|
| @@ -624,16 +647,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_webrtc_nonparallel_tests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_webrtc_nonparallel_tests",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "webrtc_nonparallel_tests"
|
| },
|
| @@ -649,9 +672,9 @@
|
| "android",
|
| "--xvfb",
|
| "--factory-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android64 Tests (L Nexus9)\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"parent_buildername\": \"Android64 Builder\", \"parent_got_revision\": \"12345\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android64 Tests (L Nexus9)\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"parent_buildername\": \"Android64 Builder\", \"parent_got_revision\": \"12345\", \"path_config\": \"kitchen\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
|
| "--build-properties",
|
| - "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android64 Tests (L Nexus9)\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"parent_buildername\": \"Android64 Builder\", \"parent_got_revision\": \"12345\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
|
| + "{\"BUILD_CONFIG\": \"Release\", \"buildername\": \"Android64 Tests (L Nexus9)\", \"buildnumber\": 1337, \"mastername\": \"client.webrtc\", \"parent_buildername\": \"Android64 Builder\", \"parent_got_revision\": \"12345\", \"path_config\": \"kitchen\", \"recipe\": \"webrtc/standalone\", \"revision\": \"12345\", \"slavename\": \"slavename\"}",
|
| "--annotate=graphing",
|
| "--results-url=https://chromeperf.appspot.com",
|
| "--perf-dashboard-id=webrtc_perf_tests",
|
| @@ -665,7 +688,7 @@
|
| "--build-number=1337",
|
| "--run-python-script",
|
| "--revision=170242",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_webrtc_perf_tests",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_webrtc_perf_tests",
|
| "--verbose"
|
| ],
|
| "name": "webrtc_perf_tests"
|
| @@ -674,12 +697,12 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_AppRTCDemoTest",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_AppRTCDemoTest",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| "name": "AppRTCDemoTest"
|
| },
|
| @@ -687,12 +710,12 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/out/Release/bin/run_libjingle_peerconnection_android_unittest",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/bin/run_libjingle_peerconnection_android_unittest",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/bad_devices.json",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| "name": "libjingle_peerconnection_android_unittest"
|
| },
|
| @@ -712,10 +735,10 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android/adb_logcat_printer.py",
|
| "--output-path",
|
| - "[SLAVE_BUILD]/src/out/Release/full_log",
|
| - "[SLAVE_BUILD]/src/out/logcat"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/full_log",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/logcat"
|
| ],
|
| "name": "logcat_dump"
|
| },
|
| @@ -732,7 +755,7 @@
|
| "GSUtil:parallel_composite_upload_threshold=50M",
|
| "----",
|
| "cp",
|
| - "[SLAVE_BUILD]/src/out/Release/full_log",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/full_log",
|
| "gs://chromium-android/logcat_dumps/Android64 Tests (L Nexus9)/1337"
|
| ],
|
| "name": "gsutil upload",
|
| @@ -742,32 +765,32 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/third_party/android_platform/development/scripts/stack",
|
| "--arch",
|
| "arm64",
|
| "--more-info",
|
| - "[SLAVE_BUILD]/src/out/Release/full_log"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/full_log"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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"
|
| + "PATH": "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_with_logcat_dump"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/tombstones.py",
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android/tombstones.py",
|
| "-a",
|
| "-s",
|
| "-w",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/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"
|
| + "PATH": "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_for_tombstones"
|
| },
|
| @@ -776,7 +799,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/Release/test_logs/*.log"
|
| + "[BUILDER_CACHE]/Android64_Tests__L_Nexus9_/src/out/Release/test_logs/*.log"
|
| ],
|
| "name": "test_report",
|
| "~followup_annotations": [
|
|
|