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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/swarming/staging.expected/android.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipes/swarming/heartbeat.expected/heartbeat_staging.json ('k') | scripts/slave/recipes/swarming/staging.expected/linux_Debug.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/swarming/staging.expected/android.json
diff --git a/scripts/slave/recipes/swarming/staging.expected/android.json b/scripts/slave/recipes/swarming/staging.expected/android.json
index b814a3eb79ef7981d9e11a0610c72c7af82ca837..f0669b084fa6966dde6dec95f19e900db9723665 100644
--- a/scripts/slave/recipes/swarming/staging.expected/android.json
+++ b/scripts/slave/recipes/swarming/staging.expected/android.json
@@ -8,7 +8,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -18,9 +17,8 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'swarming_revision': '', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'swarming_revision': '', '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']"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -43,7 +41,6 @@
"--output-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -84,10 +81,9 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[CWD]/src/tools/swarming_client/swarming.py",
"--version"
],
- "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -101,12 +97,11 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm test_isolation_mode=prepare use_goma=1",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[ROOT]/b/build/goma' target_arch=arm test_isolation_mode=prepare use_goma=1",
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
},
@@ -116,10 +111,9 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[CWD]/src/out/Release",
"--clean-isolated-files"
],
- "cwd": "[SLAVE_BUILD]",
"name": "clean isolated files"
},
{
@@ -137,9 +131,9 @@
"--target",
"Release",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[CWD]/src",
"--goma-cache-dir",
- "[GOMA_CACHE]",
+ "[ROOT]/b/build/slave/goma_cache",
"--build-tool",
"ninja",
"--compiler",
@@ -149,7 +143,7 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[BUILD]/goma",
+ "[ROOT]/b/build/goma",
"--",
"android_webview_test_apk_run",
"android_webview_unittests_apk_run",
@@ -178,10 +172,9 @@
"ui_touch_selection_unittests_apk_run",
"unit_tests_apk_run"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "PATH": "[CWD]/src/third_party/android_tools/sdk/platform-tools:[CWD]/src/build/android:%(PATH)s"
},
"name": "compile",
"~followup_annotations": [
@@ -195,11 +188,11 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[CWD]/src/out/Release",
"--src-dir",
- "[SLAVE_BUILD]/src"
+ "[CWD]/src"
],
- "cwd": "[SLAVE_BUILD]",
+ "cwd": "[CWD]",
"name": "remove_build_metadata"
},
{
@@ -208,9 +201,8 @@
"-u",
"\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n",
"/path/to/tmp/",
- "[SLAVE_BUILD]/src/out/Release/*.isolated.gen.json"
+ "[CWD]/src/out/Release/*.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "find isolated targets"
},
{
@@ -218,17 +210,16 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[CWD]/src/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver-dev.appspot.com",
"--verbose",
- "[SLAVE_BUILD]/src/out/Release/dummy_target_1.isolated.gen.json",
- "[SLAVE_BUILD]/src/out/Release/dummy_target_2.isolated.gen.json"
+ "[CWD]/src/out/Release/dummy_target_1.isolated.gen.json",
+ "[CWD]/src/out/Release/dummy_target_2.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"SWARMING_PROFILE": "1"
},
@@ -247,7 +238,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[CWD]/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm-dev.appspot.com",
@@ -300,7 +291,6 @@
"--idempotent",
"[dummy hash for chrome_public_test_apk]"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] chrome_public_test_apk on Android",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -321,7 +311,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[CWD]/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm-dev.appspot.com",
@@ -371,7 +361,6 @@
"--idempotent",
"[dummy hash for dummy_target_1]"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] dummy_target_1 on Android",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -392,7 +381,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[CWD]/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm-dev.appspot.com",
@@ -442,7 +431,6 @@
"--idempotent",
"[dummy hash for dummy_target_2]"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] dummy_target_2 on Android",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -463,7 +451,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[CWD]/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm-dev.appspot.com",
@@ -476,7 +464,6 @@
"--task-summary-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "chrome_public_test_apk on Android",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
@@ -525,7 +512,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[CWD]/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm-dev.appspot.com",
@@ -538,7 +525,6 @@
"--task-summary-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "dummy_target_1 on Android",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
@@ -587,7 +573,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[CWD]/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm-dev.appspot.com",
@@ -600,7 +586,6 @@
"--task-summary-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "dummy_target_2 on Android",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
« no previous file with comments | « scripts/slave/recipes/swarming/heartbeat.expected/heartbeat_staging.json ('k') | scripts/slave/recipes/swarming/staging.expected/linux_Debug.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698