Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(941)

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json
index a4b55244e868e1f91d09080d1eadd2e34f49f2b1..d1ace22acc076d0821d5a15ee24f7debdc8d7d16 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Android_Tests__amp_split_.json
@@ -11,13 +11,13 @@
"--slave",
"TestSlavename",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
"--git-cache-dir",
- "[GIT_CACHE]",
+ "[ROOT]/b/build/slave/cache_dir",
"--output_json",
"/path/to/tmp/json",
"--revision",
@@ -25,7 +25,6 @@
"--force",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -99,7 +98,6 @@
},
{
"cmd": [],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -110,17 +108,16 @@
"--platform",
"linux-386",
"--dest-directory",
- "[SLAVE_BUILD]/cipd",
+ "[CWD]/cipd",
"--json-output",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma.install cipd",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"fake_slave_build/cipd\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
@@ -128,10 +125,10 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/cipd/cipd",
+ "fake_slave_build/cipd",
"ensure",
"--root",
- "[CACHE]/cipd/goma",
+ "[ROOT]/b/build/slave/cache/cipd/goma",
"--list",
"infra_internal/goma/client/linux-386 release",
"--json-output",
@@ -139,7 +136,6 @@
"--service-account-json",
"/creds/service_accounts/service-account-goma-client.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -161,12 +157,11 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]",
"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=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]"
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[ROOT]/b/build/slave/cache/cipd/goma' target_arch=arm use_goma=1",
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
},
@@ -174,18 +169,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
+ "[CWD]/src/testing/scripts/get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
"--build-config-fs",
"Release",
"--paths",
- "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+ "{\"checkout\": \"[CWD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
"--properties",
"{\"buildername\": \"Android Tests (amp split)\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -197,13 +191,12 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json",
+ "[CWD]/src/testing/buildbot/chromium.fyi.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json@@@",
+ "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.fyi.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -217,7 +210,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -225,12 +217,11 @@
"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"
+ "[CWD]/src/out/Release/debug_info_dumps",
+ "[CWD]/src/out/Release/test_logs",
+ "[CWD]/src/out/build_product.zip",
+ "[CWD]/src"
],
- "cwd": "[SLAVE_BUILD]",
"name": "clean local files",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -251,11 +242,10 @@
{
"allow_subannotations": false,
"cmd": [
- "[SLAVE_BUILD]/src/build/tree_truth.sh",
- "[SLAVE_BUILD]/src",
+ "[CWD]/src/build/tree_truth.sh",
+ "[CWD]/src",
"src"
],
- "cwd": "[SLAVE_BUILD]",
"name": "tree truth steps"
},
{
@@ -263,9 +253,8 @@
"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"
+ "[CWD]/src/out/Release"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree build directory",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -295,7 +284,6 @@
"--build-number",
"571"
],
- "cwd": "[SLAVE_BUILD]",
"name": "extract build"
},
{
@@ -303,10 +291,9 @@
"python",
"-u",
"RECIPE_MODULE[build::adb]/resources/list_devices.py",
- "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
+ "['[CWD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "List adb devices",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[@@@",
@@ -320,10 +307,9 @@
"python",
"-u",
"\nimport subprocess\nimport sys\nadb_path = sys.argv[1]\nfor device in sys.argv[2:]:\n print 'Attempting to root device %s ...' % (device)\n subprocess.check_call([adb_path, '-s', device, 'root'])\n subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])\n print 'Finished rooting device %s' % (device)\n",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
"014E1F310401C009"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Root devices",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -342,25 +328,23 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/symlink.py",
+ "[CWD]/src/build/symlink.py",
"-f",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
+ "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
"~/adb"
],
- "cwd": "[SLAVE_BUILD]",
"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"
+ "[CWD]/src/build/android/adb_logcat_monitor.py",
+ "[CWD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "spawn_logcat_monitor"
},
@@ -371,29 +355,27 @@
"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"
+ "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "authorize_adb_devices"
},
{
"cmd": [
- "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
+ "[CWD]/src/build/android/buildbot/bb_device_status_check.py",
"--json-output",
"/path/to/tmp/json",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--known-devices-file",
- "[BUILD]/site_config/.known_devices"
+ "[ROOT]/b/build/site_config/.known_devices"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "device_status_check",
"~followup_annotations": [
@@ -495,18 +477,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/provision_devices.py",
+ "[CWD]/src/build/android/provision_devices.py",
"-t",
"Release",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--output-device-blacklist",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "provision_devices"
},
@@ -521,14 +502,13 @@
"/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",
+ "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
"[\"07a00ca4\"]",
"chromium.fyi",
"Android Tests (amp split)",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json"
+ "[CWD]/src/out/bad_devices.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "spawn_device_monitor"
},
{
@@ -537,13 +517,12 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"----",
"cp",
"gs://chrome-amp-keys/commit_queue_pool/api_key",
- "[BUILD]/site_config/.amp_commit_queue_pool_key"
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil download amp api key"
},
{
@@ -552,20 +531,19 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"----",
"cp",
"gs://chrome-amp-keys/commit_queue_pool/api_secret",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret"
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil download amp api secret"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"android_webview_unittests",
@@ -573,9 +551,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -593,9 +571,8 @@
"--verbose",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[trigger] android_webview_unittests",
"~followup_annotations": [
@@ -621,28 +598,27 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save android_webview_unittests"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"base_unittests",
"--isolate-file-path",
- "[SLAVE_BUILD]/src/base/base_unittests.isolate",
+ "[CWD]/src/base/base_unittests.isolate",
"--enable-platform-mode",
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -660,9 +636,8 @@
"--verbose",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[trigger] base_unittests",
"~followup_annotations": [
@@ -688,28 +663,27 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save base_unittests"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"components_unittests",
"--isolate-file-path",
- "[SLAVE_BUILD]/src/components/components_unittests.isolate",
+ "[CWD]/src/components/components_unittests.isolate",
"--enable-platform-mode",
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -727,9 +701,8 @@
"--verbose",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[trigger] components_unittests",
"~followup_annotations": [
@@ -755,16 +728,15 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save components_unittests"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"events_unittests",
@@ -772,9 +744,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -792,9 +764,8 @@
"--verbose",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[trigger] events_unittests",
"~followup_annotations": [
@@ -820,16 +791,15 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save events_unittests"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"gl_tests",
@@ -837,9 +807,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -857,9 +827,8 @@
"--verbose",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[trigger] gl_tests",
"~followup_annotations": [
@@ -885,16 +854,15 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save gl_tests"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"ipc_tests",
@@ -902,9 +870,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -922,9 +890,8 @@
"--verbose",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[trigger] ipc_tests",
"~followup_annotations": [
@@ -950,28 +917,27 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save ipc_tests"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"sql_unittests",
"--isolate-file-path",
- "[SLAVE_BUILD]/src/sql/sql_unittests.isolate",
+ "[CWD]/src/sql/sql_unittests.isolate",
"--enable-platform-mode",
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -989,9 +955,8 @@
"--verbose",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[trigger] sql_unittests",
"~followup_annotations": [
@@ -1017,28 +982,27 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save sql_unittests"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"sync_unit_tests",
"--isolate-file-path",
- "[SLAVE_BUILD]/src/sync/sync_unit_tests.isolate",
+ "[CWD]/src/sync/sync_unit_tests.isolate",
"--enable-platform-mode",
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -1056,9 +1020,8 @@
"--verbose",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[trigger] sync_unit_tests",
"~followup_annotations": [
@@ -1084,16 +1047,15 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save sync_unit_tests"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"ui_android_unittests",
@@ -1101,9 +1063,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -1121,9 +1083,8 @@
"--verbose",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[trigger] ui_android_unittests",
"~followup_annotations": [
@@ -1149,16 +1110,15 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save ui_android_unittests"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"ui_touch_selection_unittests",
@@ -1166,9 +1126,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -1186,9 +1146,8 @@
"--verbose",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[trigger] ui_touch_selection_unittests",
"~followup_annotations": [
@@ -1214,23 +1173,21 @@
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
"{\"env\": {\"device\": {\"brand\": \"Foo\", \"name\": \"Fone\", \"os_version\": \"1.2.3\"}}, \"test_run\": {\"test_run_id\": \"T35TRUN1D\"}}",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] save ui_touch_selection_unittests"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_android_webview_test_apk",
+ "[CWD]/src/out/Release/bin/run_android_webview_test_apk",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test AndroidWebViewTest",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -1258,21 +1215,19 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [AndroidWebViewTest]"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_content_shell_test_apk",
+ "[CWD]/src/out/Release/bin/run_content_shell_test_apk",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ContentShellTest",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -1300,21 +1255,19 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ContentShellTest]"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_chrome_public_test_apk",
+ "[CWD]/src/out/Release/bin/run_chrome_public_test_apk",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ChromePublicTest",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -1342,21 +1295,19 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ChromePublicTest]"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_chrome_sync_shell_test_apk",
+ "[CWD]/src/out/Release/bin/run_chrome_sync_shell_test_apk",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Instrumentation test ChromeSyncShellTest",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -1384,25 +1335,23 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [ChromeSyncShellTest]"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_breakpad_unittests",
+ "[CWD]/src/out/Release/bin/run_breakpad_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--flakiness-dashboard-server=test-results.appspot.com",
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "breakpad_unittests"
},
@@ -1410,18 +1359,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_cc_unittests",
+ "[CWD]/src/out/Release/bin/run_cc_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--flakiness-dashboard-server=test-results.appspot.com",
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "cc_unittests"
},
@@ -1429,18 +1377,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_content_browsertests",
+ "[CWD]/src/out/Release/bin/run_content_browsertests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--flakiness-dashboard-server=test-results.appspot.com",
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "content_browsertests"
},
@@ -1448,18 +1395,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_content_unittests",
+ "[CWD]/src/out/Release/bin/run_content_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--flakiness-dashboard-server=test-results.appspot.com",
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "content_unittests"
},
@@ -1467,18 +1413,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_gpu_unittests",
+ "[CWD]/src/out/Release/bin/run_gpu_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--flakiness-dashboard-server=test-results.appspot.com",
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "gpu_unittests"
},
@@ -1486,18 +1431,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_media_unittests",
+ "[CWD]/src/out/Release/bin/run_media_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--flakiness-dashboard-server=test-results.appspot.com",
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "media_unittests"
},
@@ -1505,21 +1449,20 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_net_unittests",
+ "[CWD]/src/out/Release/bin/run_net_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
- "--isolate_file_path=[SLAVE_BUILD]/src/net/net_unittests.isolate",
+ "--isolate_file_path=[CWD]/src/net/net_unittests.isolate",
"--flakiness-dashboard-server=test-results.appspot.com",
"--json-results-file",
"/path/to/tmp/json",
"-t",
"300"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "net_unittests"
},
@@ -1527,18 +1470,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_sandbox_linux_unittests",
+ "[CWD]/src/out/Release/bin/run_sandbox_linux_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--flakiness-dashboard-server=test-results.appspot.com",
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "sandbox_linux_unittests"
},
@@ -1546,18 +1488,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_ui_base_unittests",
+ "[CWD]/src/out/Release/bin/run_ui_base_unittests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--flakiness-dashboard-server=test-results.appspot.com",
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "ui_base_unittests"
},
@@ -1565,18 +1506,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_unit_tests",
+ "[CWD]/src/out/Release/bin/run_unit_tests",
"--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "[CWD]/src/out/bad_devices.json",
"--verbose",
"--flakiness-dashboard-server=test-results.appspot.com",
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "unit_tests"
},
@@ -1584,7 +1524,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"junit",
"-s",
"junit_unit_tests",
@@ -1593,11 +1533,10 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "junit_unit_tests",
"~followup_annotations": [
@@ -1626,14 +1565,13 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [junit_unit_tests]"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"junit",
"-s",
"chrome_junit_tests",
@@ -1642,11 +1580,10 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "chrome_junit_tests",
"~followup_annotations": [
@@ -1675,14 +1612,13 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [chrome_junit_tests]"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"junit",
"-s",
"content_junit_tests",
@@ -1691,11 +1627,10 @@
"--json-results-file",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "content_junit_tests",
"~followup_annotations": [
@@ -1724,7 +1659,6 @@
"--chrome-revision",
"refs/heads/master@{#170242}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Upload to test-results [content_junit_tests]"
},
{
@@ -1732,10 +1666,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[collect] load android_webview_unittests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1754,7 +1687,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"android_webview_unittests",
@@ -1762,9 +1695,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -1778,17 +1711,16 @@
"--remote-device-os",
"4.4.2",
"--collect",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[collect] android_webview_unittests",
"~followup_annotations": [
@@ -1800,10 +1732,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[collect] load base_unittests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1822,19 +1753,19 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"base_unittests",
"--isolate-file-path",
- "[SLAVE_BUILD]/src/base/base_unittests.isolate",
+ "[CWD]/src/base/base_unittests.isolate",
"--enable-platform-mode",
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -1848,17 +1779,16 @@
"--remote-device-os",
"4.4.2",
"--collect",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[collect] base_unittests",
"~followup_annotations": [
@@ -1870,10 +1800,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[collect] load components_unittests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1892,19 +1821,19 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"components_unittests",
"--isolate-file-path",
- "[SLAVE_BUILD]/src/components/components_unittests.isolate",
+ "[CWD]/src/components/components_unittests.isolate",
"--enable-platform-mode",
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -1918,17 +1847,16 @@
"--remote-device-os",
"4.4.2",
"--collect",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[collect] components_unittests",
"~followup_annotations": [
@@ -1940,10 +1868,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[collect] load events_unittests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1962,7 +1889,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"events_unittests",
@@ -1970,9 +1897,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -1986,17 +1913,16 @@
"--remote-device-os",
"4.4.2",
"--collect",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[collect] events_unittests",
"~followup_annotations": [
@@ -2008,10 +1934,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[collect] load gl_tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2030,7 +1955,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"gl_tests",
@@ -2038,9 +1963,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -2054,17 +1979,16 @@
"--remote-device-os",
"4.4.2",
"--collect",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[collect] gl_tests",
"~followup_annotations": [
@@ -2076,10 +2000,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[collect] load ipc_tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2098,7 +2021,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"ipc_tests",
@@ -2106,9 +2029,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -2122,17 +2045,16 @@
"--remote-device-os",
"4.4.2",
"--collect",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[collect] ipc_tests",
"~followup_annotations": [
@@ -2144,10 +2066,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[collect] load sql_unittests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2166,19 +2087,19 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"sql_unittests",
"--isolate-file-path",
- "[SLAVE_BUILD]/src/sql/sql_unittests.isolate",
+ "[CWD]/src/sql/sql_unittests.isolate",
"--enable-platform-mode",
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -2192,17 +2113,16 @@
"--remote-device-os",
"4.4.2",
"--collect",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[collect] sql_unittests",
"~followup_annotations": [
@@ -2214,10 +2134,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[collect] load sync_unit_tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2236,19 +2155,19 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"sync_unit_tests",
"--isolate-file-path",
- "[SLAVE_BUILD]/src/sync/sync_unit_tests.isolate",
+ "[CWD]/src/sync/sync_unit_tests.isolate",
"--enable-platform-mode",
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -2262,17 +2181,16 @@
"--remote-device-os",
"4.4.2",
"--collect",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[collect] sync_unit_tests",
"~followup_annotations": [
@@ -2284,10 +2202,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[collect] load ui_android_unittests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2306,7 +2223,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"ui_android_unittests",
@@ -2314,9 +2231,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -2330,17 +2247,16 @@
"--remote-device-os",
"4.4.2",
"--collect",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[collect] ui_android_unittests",
"~followup_annotations": [
@@ -2352,10 +2268,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[collect] load ui_touch_selection_unittests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2374,7 +2289,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
+ "[CWD]/src/build/android/test_runner.py",
"gtest",
"-s",
"ui_touch_selection_unittests",
@@ -2382,9 +2297,9 @@
"-e",
"remote_device",
"--api-key-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_key",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
"--api-secret-file",
- "[BUILD]/site_config/.amp_commit_queue_pool_secret",
+ "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
"--api-address",
"172.22.21.180",
"--api-port",
@@ -2398,17 +2313,16 @@
"--remote-device-os",
"4.4.2",
"--collect",
- "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
+ "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
"--results-path",
- "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
+ "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
"--verbose",
"--json-results-file",
"/path/to/tmp/json",
"--release"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
},
"name": "[collect] ui_touch_selection_unittests",
"~followup_annotations": [
@@ -2425,19 +2339,17 @@
"--pid-file-path",
"/tmp/device_monitor.pid"
],
- "cwd": "[SLAVE_BUILD]",
"name": "shutdown_device_monitor"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
+ "[CWD]/src/build/android/adb_logcat_printer.py",
"--output-path",
- "[SLAVE_BUILD]/src/out/Release/full_log",
- "[SLAVE_BUILD]/src/out/logcat"
+ "[CWD]/src/out/Release/full_log",
+ "[CWD]/src/out/logcat"
],
- "cwd": "[SLAVE_BUILD]",
"name": "logcat_dump"
},
{
@@ -2446,17 +2358,16 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[DEPOT_TOOLS]/gsutil.py",
+ "[ROOT]/b/depot_tools/gsutil.py",
"--force-version",
"4.7",
"-o",
"GSUtil:parallel_composite_upload_threshold=50M",
"----",
"cp",
- "[SLAVE_BUILD]/src/out/Release/full_log",
+ "[CWD]/src/out/Release/full_log",
"gs://chromium-android/logcat_dumps/Android Tests (amp split)/571"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/Android Tests (amp split)/571@@@"
@@ -2464,32 +2375,30 @@
},
{
"cmd": [
- "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",
+ "[CWD]/src/third_party/android_platform/development/scripts/stack",
"--arch",
"arm",
"--more-info",
- "[SLAVE_BUILD]/src/out/Release/full_log"
+ "[CWD]/src/out/Release/full_log"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "stack_tool_with_logcat_dump"
},
{
"cmd": [
- "[SLAVE_BUILD]/src/build/android/tombstones.py",
+ "[CWD]/src/build/android/tombstones.py",
"-a",
"-s",
"-w"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
+ "CHROMIUM_OUTPUT_DIR": "[CWD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "stack_tool_for_tombstones"
},
@@ -2498,9 +2407,8 @@
"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"
+ "[CWD]/src/out/Release/test_logs/*.log"
],
- "cwd": "[SLAVE_BUILD]",
"name": "test_report",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",

Powered by Google App Engine
This is Rietveld 408576698