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

Unified Diff: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___builder.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
Index: scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___builder.json
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___builder.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___builder.json
index 2f932d074cb60cab3f2480c12549bbaee9feae43..c1b91c8dc14eec183bd25ddd85a8660ea66ae69e 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___builder.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___builder.json
@@ -11,13 +11,13 @@
"--slave",
"TestSlavename",
"--spec",
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]",
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]",
"--root",
"v8",
"--revision_mapping_file",
"{\"v8\": \"got_revision\", \"v8/tools/swarming_client\": \"got_swarming_client_revision\"}",
"--git-cache-dir",
- "[ROOT]/b/build/slave/cache_dir",
+ "[GIT_CACHE]",
"--output_json",
"/path/to/tmp/json",
"--revision",
@@ -25,6 +25,7 @@
"--no_shallow",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -68,9 +69,10 @@
"cmd": [
"python",
"-u",
- "[CWD]/v8/tools/swarming_client/swarming.py",
+ "[SLAVE_BUILD]/v8/tools/swarming_client/swarming.py",
"--version"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -84,9 +86,10 @@
"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_DEFINES": "clang=1 gcmole=1 gomadir='[ROOT]/b/build/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_target_arch=ia32",
+ "GYP_DEFINES": "clang=1 gcmole=1 gomadir='[BUILD]/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1 v8_target_arch=ia32",
"GYP_GENERATORS": "ninja",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -101,6 +104,7 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -110,10 +114,11 @@
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
"--src-dir",
- "[CWD]/v8",
+ "[SLAVE_BUILD]/v8",
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -140,9 +145,9 @@
"--target",
"Release",
"--src-dir",
- "[CWD]/v8",
+ "[SLAVE_BUILD]/v8",
"--goma-cache-dir",
- "[ROOT]/b/build/slave/goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--compiler",
@@ -152,9 +157,10 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[ROOT]/b/build/goma",
+ "[BUILD]/goma",
"--"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -169,26 +175,27 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[CWD]/v8/tools/swarming_client",
+ "[SLAVE_BUILD]/v8/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[CWD]/v8/out/Release/benchmarks.isolated.gen.json",
- "[CWD]/v8/out/Release/bot_default.isolated.gen.json",
- "[CWD]/v8/out/Release/check-static-initializers.isolated.gen.json",
- "[CWD]/v8/out/Release/ignition.isolated.gen.json",
- "[CWD]/v8/out/Release/mjsunit.isolated.gen.json",
- "[CWD]/v8/out/Release/mozilla.isolated.gen.json",
- "[CWD]/v8/out/Release/optimize_for_size.isolated.gen.json",
- "[CWD]/v8/out/Release/perf.isolated.gen.json",
- "[CWD]/v8/out/Release/run-deopt-fuzzer.isolated.gen.json",
- "[CWD]/v8/out/Release/run-gcmole.isolated.gen.json",
- "[CWD]/v8/out/Release/simdjs.isolated.gen.json",
- "[CWD]/v8/out/Release/test262.isolated.gen.json"
+ "[SLAVE_BUILD]/v8/out/Release/benchmarks.isolated.gen.json",
+ "[SLAVE_BUILD]/v8/out/Release/bot_default.isolated.gen.json",
+ "[SLAVE_BUILD]/v8/out/Release/check-static-initializers.isolated.gen.json",
+ "[SLAVE_BUILD]/v8/out/Release/ignition.isolated.gen.json",
+ "[SLAVE_BUILD]/v8/out/Release/mjsunit.isolated.gen.json",
+ "[SLAVE_BUILD]/v8/out/Release/mozilla.isolated.gen.json",
+ "[SLAVE_BUILD]/v8/out/Release/optimize_for_size.isolated.gen.json",
+ "[SLAVE_BUILD]/v8/out/Release/perf.isolated.gen.json",
+ "[SLAVE_BUILD]/v8/out/Release/run-deopt-fuzzer.isolated.gen.json",
+ "[SLAVE_BUILD]/v8/out/Release/run-gcmole.isolated.gen.json",
+ "[SLAVE_BUILD]/v8/out/Release/simdjs.isolated.gen.json",
+ "[SLAVE_BUILD]/v8/out/Release/test262.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -214,7 +221,7 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[ROOT]/b/depot_tools/gsutil.py",
+ "[DEPOT_TOOLS]/gsutil.py",
"----",
"cp",
"-a",
@@ -222,6 +229,7 @@
"{\"benchmarks\": \"[dummy hash for benchmarks]\", \"bot_default\": \"[dummy hash for bot_default]\", \"check-static-initializers\": \"[dummy hash for check-static-initializers]\", \"ignition\": \"[dummy hash for ignition]\", \"mjsunit\": \"[dummy hash for mjsunit]\", \"mozilla\": \"[dummy hash for mozilla]\", \"optimize_for_size\": \"[dummy hash for optimize_for_size]\", \"perf\": \"[dummy hash for perf]\", \"run-deopt-fuzzer\": \"[dummy hash for run-deopt-fuzzer]\", \"run-gcmole\": \"[dummy hash for run-gcmole]\", \"simdjs\": \"[dummy hash for simdjs]\", \"test262\": \"[dummy hash for test262]\"}",
"gs://chromium-v8/v8-linux-rel/full-build-linux_f2cbea7e89a45f46819777bb78a1f5bd0241f64c.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-v8/v8-linux-rel/full-build-linux_f2cbea7e89a45f46819777bb78a1f5bd0241f64c.json@@@"
@@ -247,10 +255,12 @@
"--build-properties",
"{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"master\", \"buildername\": \"V8 Linux - builder\", \"buildnumber\": 571, \"mastername\": \"client.v8\", \"parent_buildername\": null, \"recipe\": \"v8\", \"revision\": \"20123\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "package build"
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "trigger",
"trigger_specs": [
{
@@ -341,6 +351,7 @@
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "trigger (2)",
"trigger_specs": [
{

Powered by Google App Engine
This is Rietveld 408576698