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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Linux_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_fyi_Linux_Builder.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Mac_Builder.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_fyi_Linux_Tester.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Linux_Tester.json b/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Linux_Tester.json
index 54203e62bdb3830781df971420f1f9b65e2e8d5d..de860bb6cf465625acd52eec66859b3dcd0df562 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Linux_Tester.json
+++ b/scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Linux_Tester.json
@@ -11,13 +11,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",
@@ -29,7 +29,6 @@
"--force",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -121,7 +120,6 @@
},
{
"cmd": [],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -132,17 +130,16 @@
"--platform",
"linux-amd64",
"--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@@@"
@@ -150,10 +147,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/linux-amd64 release",
"--json-output",
@@ -161,7 +158,6 @@
"--service-account-json",
"/creds/service_accounts/service-account-goma-client.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma.ensure_installed",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
@@ -183,10 +179,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 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "component=static_library ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/slave/cache/cipd/goma' proprietary_codecs=1 target_arch=x64 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
@@ -195,18 +190,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\": \"Linux Tester\", \"buildnumber\": 571, \"mastername\": \"chromium.webrtc.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -218,13 +212,12 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.webrtc.fyi.json",
+ "[CWD]/src/testing/buildbot/chromium.webrtc.fyi.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.webrtc.fyi.json@@@",
+ "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.webrtc.fyi.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -238,7 +231,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -246,9 +238,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@@@@",
@@ -278,7 +269,6 @@
"--build-number",
"571"
],
- "cwd": "[SLAVE_BUILD]",
"name": "extract build"
},
{
@@ -311,7 +301,6 @@
"--test-launcher-print-test-stdio=always",
"--test-launcher-bot-mode"
],
- "cwd": "[SLAVE_BUILD]",
"name": "content_browsertests"
},
{
@@ -346,7 +335,6 @@
"--test-launcher-bot-mode",
"--test-launcher-print-test-stdio=always"
],
- "cwd": "[SLAVE_BUILD]",
"name": "browser_tests"
},
{
@@ -372,7 +360,6 @@
"--build-number=571",
"content_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"name": "content_unittests"
},
{
@@ -403,7 +390,6 @@
"--test-launcher-jobs=1",
"--test-launcher-print-test-stdio=always"
],
- "cwd": "[SLAVE_BUILD]",
"name": "media_unittests"
},
{
@@ -430,7 +416,6 @@
"remoting_unittests",
"--gtest_filter=Webrtc*"
],
- "cwd": "[SLAVE_BUILD]",
"name": "remoting_unittests"
},
{
« no previous file with comments | « scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Linux_Builder.json ('k') | scripts/slave/recipes/chromium.expected/full_chromium_webrtc_fyi_Mac_Builder.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698