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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_win_Win_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
« no previous file with comments | « scripts/slave/recipes/chromium.expected/full_chromium_win_Win_7_Tests_x64__1_.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_win_Win_Builder__dbg_.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/full_chromium_win_Win_Builder.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_win_Win_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_win_Win_Builder.json
index ffdbfe059d6697db43935efa6dd808188e66546b..c0be86e9de5ffd0856ef01d9b3df9069dc16c26e 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_win_Win_Builder.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_win_Win_Builder.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]"
},
@@ -106,6 +108,7 @@
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -116,16 +119,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@@@"
@@ -133,10 +137,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",
@@ -144,6 +148,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@@@",
@@ -162,9 +167,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": [
@@ -178,10 +184,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": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[ROOT]\\b\\build\\slave\\cache\\cipd\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "archive_gpu_tests=1 chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]\\cipd\\goma' proprietary_codecs=1 target_arch=ia32 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -190,7 +197,7 @@
"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",
"--",
@@ -198,10 +205,11 @@
"Release",
"--use-src-side-runtest-py",
"--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\": \"Win Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.win\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -213,12 +221,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]\\src\\testing\\buildbot\\chromium.win.json",
+ "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [CWD]\\src\\testing\\buildbot\\chromium.win.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.win.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Win7 (32) Tests\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
@@ -253,6 +262,7 @@
"python",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -261,29 +271,31 @@
"-u",
"RECIPE_MODULE[build::isolate]\\resources\\find_isolated_tests.py",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--clean-isolated-files"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "clean isolated files"
},
{
"cmd": [
"python",
"-u",
- "[CWD]\\src\\tools\\mb\\mb.py",
+ "[SLAVE_BUILD]\\src\\tools\\mb\\mb.py",
"gen",
"-m",
"chromium.win",
"-b",
"Win Builder",
"--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",
"--swarming-targets-file",
"browser_tests\n",
"//out/Release"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "generate_build_files",
"~followup_annotations": [
"@@@STEP_LOG_LINE@swarming-targets-file.txt@browser_tests@@@",
@@ -305,9 +317,9 @@
"--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",
@@ -319,7 +331,7 @@
"--goma-service-account-json-file",
"C:\\creds\\service_accounts\\service-account-goma-client.json",
"--goma-dir",
- "[ROOT]\\b\\build\\slave\\cache\\cipd\\goma",
+ "[CACHE]\\cipd\\goma",
"--ninja-ensure-up-to-date",
"--",
"browser_tests",
@@ -327,6 +339,7 @@
"chromium_builder_tests",
"mini_installer"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "C:\\creds\\service_accounts\\service-account-goma-client.json"
},
@@ -342,11 +355,11 @@
"-u",
"RECIPE_MODULE[build::isolate]\\resources\\remove_build_metadata.py",
"--build-dir",
- "[CWD]\\src\\out\\Release",
+ "[SLAVE_BUILD]\\src\\out\\Release",
"--src-dir",
- "[CWD]\\src"
+ "[SLAVE_BUILD]\\src"
],
- "cwd": "[CWD]",
+ "cwd": "[SLAVE_BUILD]",
"name": "remove_build_metadata"
},
{
@@ -354,15 +367,16 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]\\resources\\isolate.py",
- "[CWD]\\src\\tools\\swarming_client",
+ "[SLAVE_BUILD]\\src\\tools\\swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[CWD]\\src\\out\\Release\\browser_tests.isolated.gen.json"
+ "[SLAVE_BUILD]\\src\\out\\Release\\browser_tests.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -391,10 +405,12 @@
"--build-properties",
"{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]\\\\build_data_dir\", \"buildername\": \"Win Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.win\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "package build"
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "trigger",
"trigger_specs": [
{
@@ -421,6 +437,7 @@
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "trigger (2)",
"trigger_specs": [
{
« no previous file with comments | « scripts/slave/recipes/chromium.expected/full_chromium_win_Win_7_Tests_x64__1_.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_win_Win_Builder__dbg_.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698