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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/chromium_webkit_parent_revision_webkit.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.expected/chromium_webkit_parent_revision_chromium.json ('k') | scripts/slave/recipes/chromium.expected/chromium_webkit_revision_chromium.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/chromium_webkit_parent_revision_webkit.json
diff --git a/scripts/slave/recipes/chromium.expected/chromium_webkit_parent_revision_webkit.json b/scripts/slave/recipes/chromium.expected/chromium_webkit_parent_revision_webkit.json
index e90d60fd50551cdf9811fdceacf8d43f4fbc6f7b..f85490ba968fc1d9c62871c55eceeb728714fa5b 100644
--- a/scripts/slave/recipes/chromium.expected/chromium_webkit_parent_revision_webkit.json
+++ b/scripts/slave/recipes/chromium.expected/chromium_webkit_parent_revision_webkit.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",
@@ -35,6 +36,7 @@
"--force",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -109,6 +111,7 @@
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -119,16 +122,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@@@"
@@ -136,10 +140,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",
@@ -147,6 +151,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@@@",
@@ -165,9 +170,10 @@
"cmd": [
"python",
"-u",
- "[CWD]\\src\\tools\\swarming_client\\swarming.py",
+ "[SLAVE_BUILD]\\src\\tools\\swarming_client\\swarming.py",
"--version"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -181,10 +187,11 @@
"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",
- "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[ROOT]\\b\\build\\slave\\cache\\cipd\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 gomadir='[CACHE]\\cipd\\goma' target_arch=ia32 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -193,17 +200,18 @@
"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",
"--",
"--build-config-fs",
"Release",
"--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\": \"WebKit Win7\", \"buildnumber\": 571, \"mastername\": \"chromium.webkit\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -215,12 +223,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]\\src\\testing\\buildbot\\chromium.webkit.json",
+ "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.webkit.json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [CWD]\\src\\testing\\buildbot\\chromium.webkit.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.webkit.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -234,6 +243,7 @@
"python",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -241,8 +251,9 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[CWD]\\src\\out\\Release"
+ "[SLAVE_BUILD]\\src\\out\\Release"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree build directory",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -274,6 +285,7 @@
"--build-number",
"571"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "extract build"
},
{
@@ -292,13 +304,13 @@
"--slave-name=TestSlavename",
"--build-number=571",
"--run-python-script",
- "[ROOT]\\b\\build\\scripts\\slave\\chromium\\layout_test_wrapper.py",
+ "[BUILD]\\scripts\\slave\\chromium\\layout_test_wrapper.py",
"--target",
"Release",
"-o",
- "[CWD]\\layout-test-results",
+ "[SLAVE_BUILD]\\layout-test-results",
"--build-dir",
- "[CWD]\\src\\out",
+ "[SLAVE_BUILD]\\src\\out",
"--json-test-results",
"/path/to/tmp/json",
"--test-results-server",
@@ -310,6 +322,7 @@
"--step-name",
"webkit_tests"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "webkit_tests",
"~followup_annotations": [
"@@@STEP_TEXT@<br/>Total executed: 9001<br/>@@@"
@@ -319,11 +332,11 @@
"cmd": [
"python",
"-u",
- "[ROOT]\\b\\build\\scripts\\slave\\chromium\\archive_layout_test_results.py",
+ "[BUILD]\\scripts\\slave\\chromium\\archive_layout_test_results.py",
"--results-dir",
- "[CWD]\\layout-test-results",
+ "[SLAVE_BUILD]\\layout-test-results",
"--build-dir",
- "[CWD]\\src\\out",
+ "[SLAVE_BUILD]\\src\\out",
"--build-number",
"571",
"--builder-name",
@@ -331,6 +344,7 @@
"--gs-bucket",
"gs://chromium-layout-test-archives"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "archive_webkit_tests_results",
"~followup_annotations": [
"@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/WebKit_Win7/571/layout-test-results/results.html@@@",
@@ -345,6 +359,7 @@
"--target",
"Release"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "process_dumps"
},
{
« no previous file with comments | « scripts/slave/recipes/chromium.expected/chromium_webkit_parent_revision_chromium.json ('k') | scripts/slave/recipes/chromium.expected/chromium_webkit_revision_chromium.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698