| 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 d1ace22acc076d0821d5a15ee24f7debdc8d7d16..a4b55244e868e1f91d09080d1eadd2e34f49f2b1 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 = '[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']",
|
| + "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']",
|
| "--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",
|
| - "[ROOT]/b/build/slave/cache_dir",
|
| + "[GIT_CACHE]",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| @@ -25,6 +25,7 @@
|
| "--force",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -98,6 +99,7 @@
|
| },
|
| {
|
| "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "ensure_goma"
|
| },
|
| {
|
| @@ -108,16 +110,17 @@
|
| "--platform",
|
| "linux-386",
|
| "--dest-directory",
|
| - "[CWD]/cipd",
|
| + "[SLAVE_BUILD]/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\": \"fake_slave_build/cipd\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/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@@@"
|
| @@ -125,10 +128,10 @@
|
| },
|
| {
|
| "cmd": [
|
| - "fake_slave_build/cipd",
|
| + "[SLAVE_BUILD]/cipd/cipd",
|
| "ensure",
|
| "--root",
|
| - "[ROOT]/b/build/slave/cache/cipd/goma",
|
| + "[CACHE]/cipd/goma",
|
| "--list",
|
| "infra_internal/goma/client/linux-386 release",
|
| "--json-output",
|
| @@ -136,6 +139,7 @@
|
| "--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@@@",
|
| @@ -157,11 +161,12 @@
|
| "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='[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]"
|
| + "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]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -169,17 +174,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/testing/scripts/get_compile_targets.py",
|
| + "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Release",
|
| "--paths",
|
| - "{\"checkout\": \"[CWD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[SLAVE_BUILD]/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@{}@@@",
|
| @@ -191,12 +197,13 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[CWD]/src/testing/buildbot/chromium.fyi.json",
|
| + "[SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "read test spec",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.fyi.json@@@",
|
| + "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -210,6 +217,7 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "cleanup_temp"
|
| },
|
| {
|
| @@ -217,11 +225,12 @@
|
| "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",
|
| - "[CWD]/src/out/Release/debug_info_dumps",
|
| - "[CWD]/src/out/Release/test_logs",
|
| - "[CWD]/src/out/build_product.zip",
|
| - "[CWD]/src"
|
| + "[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": "[SLAVE_BUILD]",
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -242,10 +251,11 @@
|
| {
|
| "allow_subannotations": false,
|
| "cmd": [
|
| - "[CWD]/src/build/tree_truth.sh",
|
| - "[CWD]/src",
|
| + "[SLAVE_BUILD]/src/build/tree_truth.sh",
|
| + "[SLAVE_BUILD]/src",
|
| "src"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "tree truth steps"
|
| },
|
| {
|
| @@ -253,8 +263,9 @@
|
| "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",
|
| - "[CWD]/src/out/Release"
|
| + "[SLAVE_BUILD]/src/out/Release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -284,6 +295,7 @@
|
| "--build-number",
|
| "571"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "extract build"
|
| },
|
| {
|
| @@ -291,9 +303,10 @@
|
| "python",
|
| "-u",
|
| "RECIPE_MODULE[build::adb]/resources/list_devices.py",
|
| - "['[CWD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
|
| + "['[SLAVE_BUILD]/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@[@@@",
|
| @@ -307,9 +320,10 @@
|
| "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",
|
| - "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "014E1F310401C009"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Root devices",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -328,23 +342,25 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/symlink.py",
|
| + "[SLAVE_BUILD]/src/build/symlink.py",
|
| "-f",
|
| - "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[SLAVE_BUILD]/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",
|
| "--",
|
| - "[CWD]/src/build/android/adb_logcat_monitor.py",
|
| - "[CWD]/src/out/logcat"
|
| + "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
| + "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "spawn_logcat_monitor"
|
| },
|
| @@ -355,27 +371,29 @@
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
|
| "--verbose",
|
| "--adb-path",
|
| - "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "authorize_adb_devices"
|
| },
|
| {
|
| "cmd": [
|
| - "[CWD]/src/build/android/buildbot/bb_device_status_check.py",
|
| + "[SLAVE_BUILD]/src/build/android/buildbot/bb_device_status_check.py",
|
| "--json-output",
|
| "/path/to/tmp/json",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--known-devices-file",
|
| - "[ROOT]/b/build/site_config/.known_devices"
|
| + "[BUILD]/site_config/.known_devices"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "device_status_check",
|
| "~followup_annotations": [
|
| @@ -477,17 +495,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/provision_devices.py",
|
| + "[SLAVE_BUILD]/src/build/android/provision_devices.py",
|
| "-t",
|
| "Release",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "provision_devices"
|
| },
|
| @@ -502,13 +521,14 @@
|
| "/tmp/device_monitor.pid",
|
| "--",
|
| "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
|
| - "[CWD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "[\"07a00ca4\"]",
|
| "chromium.fyi",
|
| "Android Tests (amp split)",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json"
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "spawn_device_monitor"
|
| },
|
| {
|
| @@ -517,12 +537,13 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[ROOT]/b/depot_tools/gsutil.py",
|
| + "[DEPOT_TOOLS]/gsutil.py",
|
| "----",
|
| "cp",
|
| "gs://chrome-amp-keys/commit_queue_pool/api_key",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key"
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil download amp api key"
|
| },
|
| {
|
| @@ -531,19 +552,20 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[ROOT]/b/depot_tools/gsutil.py",
|
| + "[DEPOT_TOOLS]/gsutil.py",
|
| "----",
|
| "cp",
|
| "gs://chrome-amp-keys/commit_queue_pool/api_secret",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret"
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil download amp api secret"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "android_webview_unittests",
|
| @@ -551,9 +573,9 @@
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -571,8 +593,9 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[trigger] android_webview_unittests",
|
| "~followup_annotations": [
|
| @@ -598,27 +621,28 @@
|
| "-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]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] save android_webview_unittests"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "base_unittests",
|
| "--isolate-file-path",
|
| - "[CWD]/src/base/base_unittests.isolate",
|
| + "[SLAVE_BUILD]/src/base/base_unittests.isolate",
|
| "--enable-platform-mode",
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -636,8 +660,9 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[trigger] base_unittests",
|
| "~followup_annotations": [
|
| @@ -663,27 +688,28 @@
|
| "-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]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] save base_unittests"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "components_unittests",
|
| "--isolate-file-path",
|
| - "[CWD]/src/components/components_unittests.isolate",
|
| + "[SLAVE_BUILD]/src/components/components_unittests.isolate",
|
| "--enable-platform-mode",
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -701,8 +727,9 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[trigger] components_unittests",
|
| "~followup_annotations": [
|
| @@ -728,15 +755,16 @@
|
| "-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]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] save components_unittests"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "events_unittests",
|
| @@ -744,9 +772,9 @@
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -764,8 +792,9 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[trigger] events_unittests",
|
| "~followup_annotations": [
|
| @@ -791,15 +820,16 @@
|
| "-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]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] save events_unittests"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "gl_tests",
|
| @@ -807,9 +837,9 @@
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -827,8 +857,9 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[trigger] gl_tests",
|
| "~followup_annotations": [
|
| @@ -854,15 +885,16 @@
|
| "-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]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] save gl_tests"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "ipc_tests",
|
| @@ -870,9 +902,9 @@
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -890,8 +922,9 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[trigger] ipc_tests",
|
| "~followup_annotations": [
|
| @@ -917,27 +950,28 @@
|
| "-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]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] save ipc_tests"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "sql_unittests",
|
| "--isolate-file-path",
|
| - "[CWD]/src/sql/sql_unittests.isolate",
|
| + "[SLAVE_BUILD]/src/sql/sql_unittests.isolate",
|
| "--enable-platform-mode",
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -955,8 +989,9 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[trigger] sql_unittests",
|
| "~followup_annotations": [
|
| @@ -982,27 +1017,28 @@
|
| "-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]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] save sql_unittests"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "sync_unit_tests",
|
| "--isolate-file-path",
|
| - "[CWD]/src/sync/sync_unit_tests.isolate",
|
| + "[SLAVE_BUILD]/src/sync/sync_unit_tests.isolate",
|
| "--enable-platform-mode",
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -1020,8 +1056,9 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[trigger] sync_unit_tests",
|
| "~followup_annotations": [
|
| @@ -1047,15 +1084,16 @@
|
| "-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]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] save sync_unit_tests"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "ui_android_unittests",
|
| @@ -1063,9 +1101,9 @@
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -1083,8 +1121,9 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[trigger] ui_android_unittests",
|
| "~followup_annotations": [
|
| @@ -1110,15 +1149,16 @@
|
| "-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]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] save ui_android_unittests"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "ui_touch_selection_unittests",
|
| @@ -1126,9 +1166,9 @@
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -1146,8 +1186,9 @@
|
| "--verbose",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[trigger] ui_touch_selection_unittests",
|
| "~followup_annotations": [
|
| @@ -1173,21 +1214,23 @@
|
| "-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]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] save ui_touch_selection_unittests"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_android_webview_test_apk",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_android_webview_test_apk",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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",
|
| @@ -1215,19 +1258,21 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Upload to test-results [AndroidWebViewTest]"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_content_shell_test_apk",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_content_shell_test_apk",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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",
|
| @@ -1255,19 +1300,21 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Upload to test-results [ContentShellTest]"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_chrome_public_test_apk",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_chrome_public_test_apk",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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",
|
| @@ -1295,19 +1342,21 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Upload to test-results [ChromePublicTest]"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_chrome_sync_shell_test_apk",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_chrome_sync_shell_test_apk",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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",
|
| @@ -1335,23 +1384,25 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Upload to test-results [ChromeSyncShellTest]"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_breakpad_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_breakpad_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "breakpad_unittests"
|
| },
|
| @@ -1359,17 +1410,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_cc_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_cc_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "cc_unittests"
|
| },
|
| @@ -1377,17 +1429,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_content_browsertests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_content_browsertests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "content_browsertests"
|
| },
|
| @@ -1395,17 +1448,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_content_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_content_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "content_unittests"
|
| },
|
| @@ -1413,17 +1467,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_gpu_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_gpu_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "gpu_unittests"
|
| },
|
| @@ -1431,17 +1486,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_media_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_media_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "media_unittests"
|
| },
|
| @@ -1449,20 +1505,21 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_net_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_net_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| "--verbose",
|
| - "--isolate_file_path=[CWD]/src/net/net_unittests.isolate",
|
| + "--isolate_file_path=[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "net_unittests"
|
| },
|
| @@ -1470,17 +1527,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_sandbox_linux_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_sandbox_linux_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "sandbox_linux_unittests"
|
| },
|
| @@ -1488,17 +1546,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_ui_base_unittests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_ui_base_unittests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "ui_base_unittests"
|
| },
|
| @@ -1506,17 +1565,18 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/out/Release/bin/run_unit_tests",
|
| + "[SLAVE_BUILD]/src/out/Release/bin/run_unit_tests",
|
| "--blacklist-file",
|
| - "[CWD]/src/out/bad_devices.json",
|
| + "[SLAVE_BUILD]/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": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "unit_tests"
|
| },
|
| @@ -1524,7 +1584,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "junit",
|
| "-s",
|
| "junit_unit_tests",
|
| @@ -1533,10 +1593,11 @@
|
| "--json-results-file",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release",
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "junit_unit_tests",
|
| "~followup_annotations": [
|
| @@ -1565,13 +1626,14 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Upload to test-results [junit_unit_tests]"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "junit",
|
| "-s",
|
| "chrome_junit_tests",
|
| @@ -1580,10 +1642,11 @@
|
| "--json-results-file",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release",
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "chrome_junit_tests",
|
| "~followup_annotations": [
|
| @@ -1612,13 +1675,14 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Upload to test-results [chrome_junit_tests]"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "junit",
|
| "-s",
|
| "content_junit_tests",
|
| @@ -1627,10 +1691,11 @@
|
| "--json-results-file",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release",
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "content_junit_tests",
|
| "~followup_annotations": [
|
| @@ -1659,6 +1724,7 @@
|
| "--chrome-revision",
|
| "refs/heads/master@{#170242}"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Upload to test-results [content_junit_tests]"
|
| },
|
| {
|
| @@ -1666,9 +1732,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/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@{@@@",
|
| @@ -1687,7 +1754,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "android_webview_unittests",
|
| @@ -1695,9 +1762,9 @@
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -1711,16 +1778,17 @@
|
| "--remote-device-os",
|
| "4.4.2",
|
| "--collect",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "--results-path",
|
| - "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| + "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[collect] android_webview_unittests",
|
| "~followup_annotations": [
|
| @@ -1732,9 +1800,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/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@{@@@",
|
| @@ -1753,19 +1822,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "base_unittests",
|
| "--isolate-file-path",
|
| - "[CWD]/src/base/base_unittests.isolate",
|
| + "[SLAVE_BUILD]/src/base/base_unittests.isolate",
|
| "--enable-platform-mode",
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -1779,16 +1848,17 @@
|
| "--remote-device-os",
|
| "4.4.2",
|
| "--collect",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "--results-path",
|
| - "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| + "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[collect] base_unittests",
|
| "~followup_annotations": [
|
| @@ -1800,9 +1870,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/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@{@@@",
|
| @@ -1821,19 +1892,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "components_unittests",
|
| "--isolate-file-path",
|
| - "[CWD]/src/components/components_unittests.isolate",
|
| + "[SLAVE_BUILD]/src/components/components_unittests.isolate",
|
| "--enable-platform-mode",
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -1847,16 +1918,17 @@
|
| "--remote-device-os",
|
| "4.4.2",
|
| "--collect",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "--results-path",
|
| - "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| + "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[collect] components_unittests",
|
| "~followup_annotations": [
|
| @@ -1868,9 +1940,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/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@{@@@",
|
| @@ -1889,7 +1962,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "events_unittests",
|
| @@ -1897,9 +1970,9 @@
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -1913,16 +1986,17 @@
|
| "--remote-device-os",
|
| "4.4.2",
|
| "--collect",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "--results-path",
|
| - "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| + "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[collect] events_unittests",
|
| "~followup_annotations": [
|
| @@ -1934,9 +2008,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/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@{@@@",
|
| @@ -1955,7 +2030,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "gl_tests",
|
| @@ -1963,9 +2038,9 @@
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -1979,16 +2054,17 @@
|
| "--remote-device-os",
|
| "4.4.2",
|
| "--collect",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "--results-path",
|
| - "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| + "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[collect] gl_tests",
|
| "~followup_annotations": [
|
| @@ -2000,9 +2076,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/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@{@@@",
|
| @@ -2021,7 +2098,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "ipc_tests",
|
| @@ -2029,9 +2106,9 @@
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -2045,16 +2122,17 @@
|
| "--remote-device-os",
|
| "4.4.2",
|
| "--collect",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "--results-path",
|
| - "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| + "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[collect] ipc_tests",
|
| "~followup_annotations": [
|
| @@ -2066,9 +2144,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/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@{@@@",
|
| @@ -2087,19 +2166,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "sql_unittests",
|
| "--isolate-file-path",
|
| - "[CWD]/src/sql/sql_unittests.isolate",
|
| + "[SLAVE_BUILD]/src/sql/sql_unittests.isolate",
|
| "--enable-platform-mode",
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -2113,16 +2192,17 @@
|
| "--remote-device-os",
|
| "4.4.2",
|
| "--collect",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "--results-path",
|
| - "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| + "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[collect] sql_unittests",
|
| "~followup_annotations": [
|
| @@ -2134,9 +2214,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/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@{@@@",
|
| @@ -2155,19 +2236,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "sync_unit_tests",
|
| "--isolate-file-path",
|
| - "[CWD]/src/sync/sync_unit_tests.isolate",
|
| + "[SLAVE_BUILD]/src/sync/sync_unit_tests.isolate",
|
| "--enable-platform-mode",
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -2181,16 +2262,17 @@
|
| "--remote-device-os",
|
| "4.4.2",
|
| "--collect",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "--results-path",
|
| - "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| + "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[collect] sync_unit_tests",
|
| "~followup_annotations": [
|
| @@ -2202,9 +2284,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/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@{@@@",
|
| @@ -2223,7 +2306,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "ui_android_unittests",
|
| @@ -2231,9 +2314,9 @@
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -2247,16 +2330,17 @@
|
| "--remote-device-os",
|
| "4.4.2",
|
| "--collect",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "--results-path",
|
| - "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| + "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[collect] ui_android_unittests",
|
| "~followup_annotations": [
|
| @@ -2268,9 +2352,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/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@{@@@",
|
| @@ -2289,7 +2374,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/test_runner.py",
|
| + "[SLAVE_BUILD]/src/build/android/test_runner.py",
|
| "gtest",
|
| "-s",
|
| "ui_touch_selection_unittests",
|
| @@ -2297,9 +2382,9 @@
|
| "-e",
|
| "remote_device",
|
| "--api-key-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_key",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_key",
|
| "--api-secret-file",
|
| - "[ROOT]/b/build/site_config/.amp_commit_queue_pool_secret",
|
| + "[BUILD]/site_config/.amp_commit_queue_pool_secret",
|
| "--api-address",
|
| "172.22.21.180",
|
| "--api-port",
|
| @@ -2313,16 +2398,17 @@
|
| "--remote-device-os",
|
| "4.4.2",
|
| "--collect",
|
| - "[TMP]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| + "[TMP_BASE]/amp_trigger_tmp_1/T35TRUN1D.json",
|
| "--results-path",
|
| - "[TMP]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| + "[TMP_BASE]/amp_results_tmp_2/T35TRUN1D/results.zip",
|
| "--verbose",
|
| "--json-results-file",
|
| "/path/to/tmp/json",
|
| "--release"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release"
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
|
| },
|
| "name": "[collect] ui_touch_selection_unittests",
|
| "~followup_annotations": [
|
| @@ -2339,17 +2425,19 @@
|
| "--pid-file-path",
|
| "/tmp/device_monitor.pid"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "shutdown_device_monitor"
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[CWD]/src/build/android/adb_logcat_printer.py",
|
| + "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
| "--output-path",
|
| - "[CWD]/src/out/Release/full_log",
|
| - "[CWD]/src/out/logcat"
|
| + "[SLAVE_BUILD]/src/out/Release/full_log",
|
| + "[SLAVE_BUILD]/src/out/logcat"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "logcat_dump"
|
| },
|
| {
|
| @@ -2358,16 +2446,17 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[ROOT]/b/depot_tools/gsutil.py",
|
| + "[DEPOT_TOOLS]/gsutil.py",
|
| "--force-version",
|
| "4.7",
|
| "-o",
|
| "GSUtil:parallel_composite_upload_threshold=50M",
|
| "----",
|
| "cp",
|
| - "[CWD]/src/out/Release/full_log",
|
| + "[SLAVE_BUILD]/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@@@"
|
| @@ -2375,30 +2464,32 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[CWD]/src/third_party/android_platform/development/scripts/stack",
|
| + "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",
|
| "--arch",
|
| "arm",
|
| "--more-info",
|
| - "[CWD]/src/out/Release/full_log"
|
| + "[SLAVE_BUILD]/src/out/Release/full_log"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release",
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_with_logcat_dump"
|
| },
|
| {
|
| "cmd": [
|
| - "[CWD]/src/build/android/tombstones.py",
|
| + "[SLAVE_BUILD]/src/build/android/tombstones.py",
|
| "-a",
|
| "-s",
|
| "-w"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[CWD]/src/out/Release",
|
| + "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
|
| + "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_for_tombstones"
|
| },
|
| @@ -2407,8 +2498,9 @@
|
| "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",
|
| - "[CWD]/src/out/Release/test_logs/*.log"
|
| + "[SLAVE_BUILD]/src/out/Release/test_logs/*.log"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "test_report",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
|
|