scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json - Issue 1917243002: Revert "build: roll infra_paths changes"

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: 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

« no previous file with comments | « scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_compile_rel.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_clang_dbg_recipe.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json

diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json

index 0bd64a20fdb80d8935647ddf9a3aba114e2d3d5f..e9b3715d73eb6574076af0a10b264ab1db721dc8 100644

--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.json

+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_chromium_gn_rel.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]",

"--issue",

"12853011",

"--patchset",

@@ -30,6 +30,7 @@

"src@HEAD",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -103,6 +104,7 @@

{

"cmd": [],

+ "cwd": "[SLAVE_BUILD]",

"name": "ensure_goma"

{

@@ -113,16 +115,17 @@

"--platform",

"linux-amd64",

"--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@@@"

@@ -130,10 +133,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-amd64 release",

"--json-output",

@@ -141,6 +144,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@@@",

@@ -162,12 +166,13 @@

"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_CHROMIUM_NO_ACTION": "1",

"GYP_CROSSCOMPILE": "1",

- "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 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 dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1",

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

"name": "gclient runhooks (with patch)"

@@ -175,7 +180,7 @@

"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",

"--",

@@ -183,10 +188,11 @@

"Release",

"--use-src-side-runtest-py",

"--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_chromium_gn_rel\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"

+ "cwd": "[SLAVE_BUILD]",

"name": "get compile targets for scripts",

"~followup_annotations": [

"@@@STEP_LOG_LINE@json.output@{}@@@",

@@ -198,12 +204,13 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[CWD]/src/testing/buildbot/chromium.linux.json",

+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "read test spec",

"~followup_annotations": [

- "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.linux.json@@@",

+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",

"@@@STEP_LOG_LINE@json.output@{}@@@",

"@@@STEP_LOG_END@json.output@@@"

]

@@ -215,7 +222,7 @@

"--cached",

"--name-only"

- "cwd": "[CWD]/src",

+ "cwd": "[SLAVE_BUILD]/src",

"name": "git diff to analyze patch",

"stdout": "/path/to/tmp/",

"~followup_annotations": [

@@ -229,9 +236,10 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[CWD]/src/testing/buildbot/trybot_analyze_config.json",

+ "[SLAVE_BUILD]/src/testing/buildbot/trybot_analyze_config.json",

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "read filter exclusion spec",

"~followup_annotations": [

"@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",

@@ -254,6 +262,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "analyze",

"~followup_annotations": [

"@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",

@@ -309,6 +318,7 @@

"python",

"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"

+ "cwd": "[SLAVE_BUILD]",

"name": "cleanup_temp"

{

@@ -316,11 +326,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@@@@",

@@ -341,28 +352,30 @@

{

"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"

{

"cmd": [

"python",

"-u",

- "[CWD]/src/tools/mb/mb.py",

+ "[SLAVE_BUILD]/src/tools/mb/mb.py",

"gen",

"-m",

"tryserver.chromium.android",

"-b",

"android_chromium_gn_rel",

"--config-file",

- "[CWD]/src/tools/mb/mb_config.pyl",

+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",

"--goma-dir",

- "[ROOT]/b/build/slave/cache/cipd/goma",

+ "[CACHE]/cipd/goma",

"//out/Release"

+ "cwd": "[SLAVE_BUILD]",

"name": "generate_build_files (with patch)"

{

@@ -380,9 +393,9 @@

"--target",

"Release",

"--src-dir",

- "[CWD]/src",

+ "[SLAVE_BUILD]/src",

"--goma-cache-dir",

- "[ROOT]/b/build/slave/goma_cache",

+ "[GOMA_CACHE]",

"--build-tool",

"ninja",

"--compiler",

@@ -392,7 +405,7 @@

"--goma-service-account-json-file",

"/creds/service_accounts/service-account-goma-client.json",

"--goma-dir",

- "[ROOT]/b/build/slave/cache/cipd/goma",

+ "[CACHE]/cipd/goma",

"--goma-fail-fast",

"--goma-disable-local-fallback",

"--",

@@ -404,9 +417,10 @@

"mojo_test_apk",

"sandbox_linux_unittests_deps"

+ "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": "compile (with patch)",

"~followup_annotations": [

@@ -420,29 +434,32 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "mark: before_tests"

{

"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"

@@ -453,27 +470,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": [

@@ -575,17 +594,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"

@@ -600,26 +620,28 @@

"/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\"]",

"tryserver.chromium.android",

"android_chromium_gn_rel",

"--blacklist-file",

- "[CWD]/src/out/bad_devices.json"

+ "[SLAVE_BUILD]/src/out/bad_devices.json"

+ "cwd": "[SLAVE_BUILD]",

"name": "spawn_device_monitor"

{

"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 (with patch)",

"~followup_annotations": [

"step returned non-zero exit code: 1",

@@ -647,19 +669,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_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 (with patch)",

"~followup_annotations": [

"step returned non-zero exit code: 1",

@@ -687,19 +711,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 (with patch)",

"~followup_annotations": [

"step returned non-zero exit code: 1",

@@ -727,19 +753,21 @@

"--chrome-revision",

"refs/heads/master@{#170242}"

+ "cwd": "[SLAVE_BUILD]",

"name": "Upload to test-results [ChromeSyncShellTest]"

{

"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 (with patch)",

"~followup_annotations": [

"step returned non-zero exit code: 1",

@@ -767,19 +795,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_mojo_test_apk",

+ "[SLAVE_BUILD]/src/out/Release/bin/run_mojo_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 MojoTest (with patch)",

"~followup_annotations": [

"step returned non-zero exit code: 1",

@@ -807,23 +837,25 @@

"--chrome-revision",

"refs/heads/master@{#170242}"

+ "cwd": "[SLAVE_BUILD]",

"name": "Upload to test-results [MojoTest]"

{

"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 (with patch)"

@@ -831,17 +863,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 (with patch)"

@@ -857,13 +890,13 @@

"--slave",

"TestSlavename",

"--spec",

"--root",

"src",

"--revision_mapping_file",

"--git-cache-dir",

- "[ROOT]/b/build/slave/cache_dir",

+ "[GIT_CACHE]",

"--rietveld_server",

"https://codereview.chromium.org",

"--output_json",

@@ -873,6 +906,7 @@

"--force",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -939,12 +973,13 @@

"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_CHROMIUM_NO_ACTION": "1",

"GYP_CROSSCOMPILE": "1",

- "GYP_DEFINES": "OS=android component=static_library dcheck_always_on=1 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 dcheck_always_on=1 fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=arm use_goma=1",

+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

"name": "gclient runhooks (without patch)"

@@ -952,18 +987,19 @@

"cmd": [

"python",

"-u",

- "[CWD]/src/tools/mb/mb.py",

+ "[SLAVE_BUILD]/src/tools/mb/mb.py",

"gen",

"-m",

"tryserver.chromium.android",

"-b",

"android_chromium_gn_rel",

"--config-file",

- "[CWD]/src/tools/mb/mb_config.pyl",

+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",

"--goma-dir",

- "[ROOT]/b/build/slave/cache/cipd/goma",

+ "[CACHE]/cipd/goma",

"//out/Release"

+ "cwd": "[SLAVE_BUILD]",

"name": "generate_build_files (without patch)"

{

@@ -981,9 +1017,9 @@

"--target",

"Release",

"--src-dir",

- "[CWD]/src",

+ "[SLAVE_BUILD]/src",

"--goma-cache-dir",

- "[ROOT]/b/build/slave/goma_cache",

+ "[GOMA_CACHE]",

"--build-tool",

"ninja",

"--compiler",

@@ -993,7 +1029,7 @@

"--goma-service-account-json-file",

"/creds/service_accounts/service-account-goma-client.json",

"--goma-dir",

- "[ROOT]/b/build/slave/cache/cipd/goma",

+ "[CACHE]/cipd/goma",

"--goma-fail-fast",

"--goma-disable-local-fallback",

"--",

@@ -1003,9 +1039,10 @@

"content_shell_test_apk",

"mojo_test_apk"

+ "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": "compile (without patch)",

"~followup_annotations": [

@@ -1017,13 +1054,14 @@

"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 (without patch)",

"~followup_annotations": [

"step returned non-zero exit code: 1",

@@ -1051,19 +1089,21 @@

"--chrome-revision",

"refs/heads/master@{#170242}"

+ "cwd": "[SLAVE_BUILD]",

"name": "Upload to test-results [AndroidWebViewTest] (2)"

{

"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 (without patch)",

"~followup_annotations": [

"step returned non-zero exit code: 1",

@@ -1091,19 +1131,21 @@

"--chrome-revision",

"refs/heads/master@{#170242}"

+ "cwd": "[SLAVE_BUILD]",

"name": "Upload to test-results [ChromePublicTest] (2)"

{

"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 (without patch)",

"~followup_annotations": [

"step returned non-zero exit code: 1",

@@ -1131,19 +1173,21 @@

"--chrome-revision",

"refs/heads/master@{#170242}"

+ "cwd": "[SLAVE_BUILD]",

"name": "Upload to test-results [ChromeSyncShellTest] (2)"

{

"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 (without patch)",

"~followup_annotations": [

"step returned non-zero exit code: 1",

@@ -1171,19 +1215,21 @@

"--chrome-revision",

"refs/heads/master@{#170242}"

+ "cwd": "[SLAVE_BUILD]",

"name": "Upload to test-results [ContentShellTest] (2)"

{

"cmd": [

"python",

"-u",

- "[CWD]/src/out/Release/bin/run_mojo_test_apk",

+ "[SLAVE_BUILD]/src/out/Release/bin/run_mojo_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 MojoTest (without patch)",

"~followup_annotations": [

"step returned non-zero exit code: 1",

@@ -1211,6 +1257,7 @@

"--chrome-revision",

"refs/heads/master@{#170242}"

+ "cwd": "[SLAVE_BUILD]",

"name": "Upload to test-results [MojoTest] (2)"

{

@@ -1219,6 +1266,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "AndroidWebViewTest (retry summary)",

"~followup_annotations": [

"@@@STEP_TEXT@ ignored: Test.Two @@@",

@@ -1231,6 +1279,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "ChromePublicTest (retry summary)",

"~followup_annotations": [

"@@@STEP_TEXT@ ignored: Test.Two @@@",

@@ -1243,6 +1292,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "ChromeSyncShellTest (retry summary)",

"~followup_annotations": [

"@@@STEP_TEXT@ ignored: Test.Two @@@",

@@ -1255,6 +1305,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "ContentShellTest (retry summary)",

"~followup_annotations": [

"@@@STEP_TEXT@ ignored: Test.Two @@@",

@@ -1267,6 +1318,7 @@

"-u",

"import sys; sys.exit(0)"

+ "cwd": "[SLAVE_BUILD]",

"name": "MojoTest (retry summary)",

"~followup_annotations": [

"@@@STEP_TEXT@ ignored: Test.Two @@@",

@@ -1283,17 +1335,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"

{

@@ -1302,7 +1356,7 @@

"-u",

"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",

"--",

- "[ROOT]/b/depot_tools/gsutil.py",

+ "[DEPOT_TOOLS]/gsutil.py",

"--force-version",

"4.7",

"-o",

@@ -1311,9 +1365,10 @@

"cp",

"-a",

"public-read",

- "[CWD]/src/out/Release/full_log",

+ "[SLAVE_BUILD]/src/out/Release/full_log",

"gs://chromium-android/logcat_dumps/android_chromium_gn_rel/571"

+ "cwd": "[SLAVE_BUILD]",

"name": "gsutil upload",

"~followup_annotations": [

"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_chromium_gn_rel/571@@@"

@@ -1321,30 +1376,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"

@@ -1353,8 +1410,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@@@@",