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

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_lkgr_Win_SyzyASAN_LKGR.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/chromium.expected/full_chromium_lkgr_Win_SyzyASAN_LKGR.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_lkgr_Win_SyzyASAN_LKGR.json b/scripts/slave/recipes/chromium.expected/full_chromium_lkgr_Win_SyzyASAN_LKGR.json
index 2b61f3f5cf1cb3f8d60e7bed8006628bdaef5de3..8b2b717f83367947f232be7b8a13d8232303d77d 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_lkgr_Win_SyzyASAN_LKGR.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_lkgr_Win_SyzyASAN_LKGR.json
@@ -5,6 +5,7 @@
"-u",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "taskkill"
},
{
@@ -19,13 +20,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'}]",
+ "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'}]",
"--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",
@@ -33,6 +34,7 @@
"--force",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -111,6 +113,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
"runhooks"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json",
"GYP_CHROMIUM_NO_ACTION": "1",
@@ -128,10 +131,12 @@
"python",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -142,16 +147,17 @@
"--platform",
"windows-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@@@"
@@ -159,10 +165,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/windows-amd64 release",
"--json-output",
@@ -170,6 +176,7 @@
"--service-account-json",
"C:\\creds\\service_accounts\\service-account-goma-client.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -188,18 +195,19 @@
"cmd": [
"python",
"-u",
- "[CWD]\\src\\tools\\mb\\mb.py",
+ "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",
"gen",
"-m",
"chromium.lkgr",
"-b",
"Win SyzyASAN LKGR",
"--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"
},
{
@@ -217,19 +225,20 @@
"--target",
"Release",
"--src-dir",
- "[CWD]\\src",
+ "[SLAVE_BUILD]\\src",
"--goma-cache-dir",
- "[ROOT]\\b\\build\\slave\\goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--build-data-dir",
"[ROOT]\\build_data_dir",
"--goma-dir",
- "[ROOT]\\b\\build\\slave\\cache\\cipd\\goma",
+ "[CACHE]\\cipd\\goma",
"--clobber",
"--",
"chromium_builder_asan"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
@@ -240,9 +249,10 @@
"python",
"-u",
"\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "listdir build_dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[@@@",
@@ -263,18 +273,19 @@
"python",
"-u",
"RECIPE_MODULE[build::archive]\\resources\\zip_archive.py",
- "[TMP]\\chrome_staging_tmp_1",
+ "[TMP_BASE]\\chrome_staging_tmp_1",
"asan-win32-release-170242",
"[\"file 1\", \"file 2\"]",
- "[CWD]\\src\\out\\Release"
+ "[SLAVE_BUILD]\\src\\out\\Release"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "zipping"
},
{
"cmd": [
"python",
"-u",
- "[ROOT]\\b\\depot_tools\\gsutil.py",
+ "[DEPOT_TOOLS]\\gsutil.py",
"--",
"-h",
"x-goog-meta-Cr-Commit-Position:refs/heads/master@{#170242}",
@@ -285,9 +296,10 @@
"cp",
"-a",
"public-read",
- "[TMP]\\chrome_staging_tmp_1\\asan-win32-release-170242.zip",
+ "[TMP_BASE]\\chrome_staging_tmp_1\\asan-win32-release-170242.zip",
"gs://chromium-browser-syzyasan/win32-release/asan-win32-release-170242.zip"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-browser-syzyasan/win32-release/asan-win32-release-170242.zip@@@"
@@ -298,8 +310,9 @@
"python",
"-u",
"\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
- "[TMP]\\chrome_staging_tmp_1\\asan-win32-release-170242.zip"
+ "[TMP_BASE]\\chrome_staging_tmp_1\\asan-win32-release-170242.zip"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "asan-win32-release-170242.zip",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",

Powered by Google App Engine
This is Rietveld 408576698