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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Linux_deterministic.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/deterministic_build.expected/full_chromium_swarm_Android_deterministic.json ('k') | scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Linux_deterministic.json
diff --git a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Linux_deterministic.json b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Linux_deterministic.json
index 8592fcc9c164d621e46a306d664d9afc6de92c31..ba3210d13c85ae8d36669518d21107e6b3e1e71b 100644
--- a/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Linux_deterministic.json
+++ b/scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Linux_deterministic.json
@@ -8,7 +8,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -23,13 +22,13 @@
"--slave",
"TestSlavename",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
+ "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'}]",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
"--git-cache-dir",
- "[GIT_CACHE]",
+ "[ROOT]/b/build/slave/cache_dir",
"--output_json",
"/path/to/tmp/json",
"--revision",
@@ -37,7 +36,6 @@
"--force",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -116,10 +114,9 @@
"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": "component=static_library gomadir='[BUILD]/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "component=static_library gomadir='[ROOT]/b/build/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -139,9 +136,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",
@@ -151,12 +148,11 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[BUILD]/goma",
+ "[ROOT]/b/build/goma",
"--clobber",
"--",
"all"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -172,11 +168,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",
"~followup_annotations": [
"step returned non-zero exit code: 1",
@@ -189,9 +185,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"
},
{
@@ -199,16 +194,15 @@
"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.appspot.com",
- "[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]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -224,11 +218,10 @@
"python",
"-u",
"\nimport os\nimport shutil\nimport sys\nif os.path.exists(sys.argv[2]):\n shutil.rmtree(sys.argv[2])\nshutil.move(sys.argv[1], sys.argv[2])",
- "[SLAVE_BUILD]/src/out/Release",
- "[SLAVE_BUILD]/src/out/Release.1"
+ "[CWD]/src/out/Release",
+ "[CWD]/src/out/Release.1"
],
- "cwd": "[SLAVE_BUILD]",
- "name": "Move [SLAVE_BUILD]/src/out/Release to [SLAVE_BUILD]/src/out/Release.1",
+ "name": "Move [CWD]/src/out/Release to [CWD]/src/out/Release.1",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
@@ -247,10 +240,9 @@
"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": "component=static_library gomadir='[BUILD]/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "component=static_library gomadir='[ROOT]/b/build/goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks (2)"
@@ -270,9 +262,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",
@@ -282,12 +274,11 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[BUILD]/goma",
+ "[ROOT]/b/build/goma",
"--clobber",
"--",
"all"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -303,11 +294,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 (2)"
},
{
@@ -316,9 +307,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 (2)"
},
{
@@ -326,16 +316,15 @@
"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.appspot.com",
- "[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]",
"name": "isolate tests (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -351,11 +340,10 @@
"python",
"-u",
"\nimport os\nimport shutil\nimport sys\nif os.path.exists(sys.argv[2]):\n shutil.rmtree(sys.argv[2])\nshutil.move(sys.argv[1], sys.argv[2])",
- "[SLAVE_BUILD]/src/out/Release",
- "[SLAVE_BUILD]/src/out/Release.2"
+ "[CWD]/src/out/Release",
+ "[CWD]/src/out/Release.2"
],
- "cwd": "[SLAVE_BUILD]",
- "name": "Move [SLAVE_BUILD]/src/out/Release to [SLAVE_BUILD]/src/out/Release.2",
+ "name": "Move [CWD]/src/out/Release to [CWD]/src/out/Release.2",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
"@@@STEP_LOG_LINE@python.inline@import os@@@",
@@ -373,13 +361,13 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/compare_build_artifacts.py",
"--first-build-dir",
- "[SLAVE_BUILD]/src/out/Release.1",
+ "[CWD]/src/out/Release.1",
"--second-build-dir",
- "[SLAVE_BUILD]/src/out/Release.2",
+ "[CWD]/src/out/Release.2",
"--target-platform",
"linux"
],
- "cwd": "[SLAVE_BUILD]",
+ "cwd": "[CWD]",
"name": "compare_build_artifacts"
},
{
« no previous file with comments | « scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Android_deterministic.json ('k') | scripts/slave/recipes/swarming/deterministic_build.expected/full_chromium_swarm_Mac_deterministic.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698