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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_webrtc_Win10_Tester.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/chromium.expected/full_chromium_webrtc_Mac_Tester.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_webrtc_Win7_Tester.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_webrtc_Win10_Tester.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_Win10_Tester.json b/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_Win10_Tester.json
index cd54cd01610ba6a4127e87aad678677676f8725e..ef3a2c960ad65ce8b2f29450d433c935c71dc531 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_Win10_Tester.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_Win10_Tester.json
@@ -5,7 +5,6 @@
"-u",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\kill_processes.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "taskkill"
},
{
@@ -20,13 +19,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'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc.DEPS', 'url': 'https://chromium.googlesource.com/chromium/deps/webrtc/webrtc.DEPS'}]",
+ "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'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc.DEPS', 'url': 'https://chromium.googlesource.com/chromium/deps/webrtc/webrtc.DEPS'}]",
"--root",
"src",
"--revision_mapping_file",
"{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/libjingle/source/talk\": \"got_libjingle_revision\", \"src/third_party/libvpx/source\": \"got_libvpx_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",
@@ -34,7 +33,6 @@
"--force",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -124,7 +122,6 @@
},
{
"cmd": [],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -135,17 +132,16 @@
"--platform",
"windows-386",
"--dest-directory",
- "[SLAVE_BUILD]\\cipd",
+ "[CWD]\\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\": \"[SLAVE_BUILD]\\\\cipd\\\\cipd\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"executable\": \"fake_slave_build/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@@@"
@@ -153,10 +149,10 @@
},
{
"cmd": [
- "[SLAVE_BUILD]\\cipd\\cipd",
+ "fake_slave_build/cipd",
"ensure",
"--root",
- "[CACHE]\\cipd\\goma",
+ "[ROOT]\\b\\build\\slave\\cache\\cipd\\goma",
"--list",
"infra_internal/goma/client/windows-amd64 release",
"--json-output",
@@ -164,7 +160,6 @@
"--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@@@",
@@ -186,10 +181,9 @@
"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_DEFINES": "chromium_win_pch=0 component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]\\cipd\\goma' proprietary_codecs=1 target_arch=ia32 use_goma=1",
+ "GYP_DEFINES": "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 use_goma=1",
"PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -198,18 +192,17 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]\\src\\testing\\scripts\\get_compile_targets.py",
+ "[CWD]\\src\\testing\\scripts\\get_compile_targets.py",
"--output",
"/path/to/tmp/json",
"--",
"--build-config-fs",
"Release",
"--paths",
- "{\"checkout\": \"[SLAVE_BUILD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
+ "{\"checkout\": \"[CWD]\\\\src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\tools\\\\runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]\\\\scripts\\\\slave\\\\runtest.py\"}",
"--properties",
"{\"buildername\": \"Win10 Tester\", \"buildnumber\": 571, \"mastername\": \"chromium.webrtc\", \"slavename\": \"TestSlavename\", \"target_platform\": \"win\"}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -221,13 +214,12 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.webrtc.json",
+ "[CWD]\\src\\testing\\buildbot\\chromium.webrtc.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]\\src\\testing\\buildbot\\chromium.webrtc.json@@@",
+ "@@@STEP_TEXT@path: [CWD]\\src\\testing\\buildbot\\chromium.webrtc.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -241,7 +233,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]\\scripts\\slave\\cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -249,9 +240,8 @@
"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",
- "[SLAVE_BUILD]\\src\\out\\Release"
+ "[CWD]\\src\\out\\Release"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree build directory",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -281,7 +271,6 @@
"--build-number",
"571"
],
- "cwd": "[SLAVE_BUILD]",
"name": "extract build"
},
{
@@ -313,7 +302,6 @@
"--test-launcher-print-test-stdio=always",
"--test-launcher-bot-mode"
],
- "cwd": "[SLAVE_BUILD]",
"name": "content_browsertests"
},
{
@@ -347,7 +335,6 @@
"--test-launcher-bot-mode",
"--test-launcher-print-test-stdio=always"
],
- "cwd": "[SLAVE_BUILD]",
"name": "browser_tests"
},
{
@@ -372,7 +359,6 @@
"--build-number=571",
"content_unittests.exe"
],
- "cwd": "[SLAVE_BUILD]",
"name": "content_unittests"
},
{
@@ -402,7 +388,6 @@
"--test-launcher-jobs=1",
"--test-launcher-print-test-stdio=always"
],
- "cwd": "[SLAVE_BUILD]",
"name": "media_unittests"
},
{
@@ -428,7 +413,6 @@
"remoting_unittests.exe",
"--gtest_filter=Webrtc*"
],
- "cwd": "[SLAVE_BUILD]",
"name": "remoting_unittests"
},
{
@@ -439,7 +423,6 @@
"--target",
"Release"
],
- "cwd": "[SLAVE_BUILD]",
"name": "process_dumps"
},
{
« no previous file with comments | « scripts/slave/recipes/chromium.expected/full_chromium_webrtc_Mac_Tester.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_webrtc_Win7_Tester.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698