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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.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_trybot.expected/dont_analyze_for_non_src_project.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_compile_dbg.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json b/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
index d6c67875cdc5502458f811c5f89dc409147175cd..e2aff32fc98cd8a15e58619e4ae9270943d0ed5a 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.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'}]",
+ "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'}]",
"--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",
- "[GIT_CACHE]",
+ "[ROOT]/b/build/slave/cache_dir",
"--issue",
"12853011",
"--patchset",
@@ -30,7 +30,6 @@
"src@HEAD",
"--output_manifest"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -104,7 +103,6 @@
},
{
"cmd": [],
- "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -115,17 +113,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@@@"
@@ -133,10 +130,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",
@@ -144,7 +141,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@@@",
@@ -163,10 +159,9 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[CWD]/src/tools/swarming_client/swarming.py",
"--version"
],
- "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -180,11 +175,10 @@
"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_CHROMIUM_NO_ACTION": "1",
- "GYP_DEFINES": "archive_gpu_tests=1 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
+ "GYP_DEFINES": "archive_gpu_tests=1 component=static_library dcheck_always_on=1 fastbuild=1 ffmpeg_branding=Chrome gomadir='[ROOT]/b/build/slave/cache/cipd/goma' proprietary_codecs=1 target_arch=x64 test_isolation_mode=prepare use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks (with patch)"
@@ -193,7 +187,7 @@
"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",
"--",
@@ -201,11 +195,10 @@
"Release",
"--use-src-side-runtest-py",
"--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_chromium_rel_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
],
- "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -217,13 +210,12 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.gpu.json",
+ "[CWD]/src/testing/buildbot/chromium.gpu.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.gpu.json@@@",
+ "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.gpu.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -233,13 +225,12 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
+ "[CWD]/src/testing/buildbot/chromium.linux.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "read test spec (2)",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
+ "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.linux.json@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"Linux Tests\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"isolated_scripts\": [@@@",
@@ -274,7 +265,7 @@
"--cached",
"--name-only"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[CWD]/src",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -288,10 +279,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/trybot_analyze_config.json",
+ "[CWD]/src/testing/buildbot/trybot_analyze_config.json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "read filter exclusion spec",
"~followup_annotations": [
"@@@STEP_TEXT@path: 'testing/buildbot/trybot_analyze_config.json'@@@",
@@ -314,7 +304,6 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "analyze",
"~followup_annotations": [
"@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
@@ -350,7 +339,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -359,31 +347,29 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[CWD]/src/out/Release",
"--clean-isolated-files"
],
- "cwd": "[SLAVE_BUILD]",
"name": "clean isolated files"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/mb/mb.py",
+ "[CWD]/src/tools/mb/mb.py",
"gen",
"-m",
"tryserver.chromium.linux",
"-b",
"linux_chromium_rel_ng",
"--config-file",
- "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
+ "[CWD]/src/tools/mb/mb_config.pyl",
"--goma-dir",
- "[CACHE]/cipd/goma",
+ "[ROOT]/b/build/slave/cache/cipd/goma",
"--swarming-targets-file",
"telemetry_gpu_unittests\n",
"//out/Release"
],
- "cwd": "[SLAVE_BUILD]",
"name": "generate_build_files (with patch)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@swarming-targets-file.txt@telemetry_gpu_unittests@@@",
@@ -405,9 +391,9 @@
"--target",
"Release",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "[CWD]/src",
"--goma-cache-dir",
- "[GOMA_CACHE]",
+ "[ROOT]/b/build/slave/goma_cache",
"--build-tool",
"ninja",
"--compiler",
@@ -417,7 +403,7 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[CACHE]/cipd/goma",
+ "[ROOT]/b/build/slave/cache/cipd/goma",
"--goma-fail-fast",
"--goma-disable-local-fallback",
"--ninja-ensure-up-to-date",
@@ -425,7 +411,6 @@
"chromium_swarm_tests",
"telemetry_gpu_unittests"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -441,11 +426,11 @@
"-u",
"RECIPE_MODULE[build::isolate]/resources/remove_build_metadata.py",
"--build-dir",
- "[SLAVE_BUILD]/src/out/Release",
+ "[CWD]/src/out/Release",
"--src-dir",
- "[SLAVE_BUILD]/src"
+ "[CWD]/src"
],
- "cwd": "[SLAVE_BUILD]",
+ "cwd": "[CWD]",
"name": "remove_build_metadata"
},
{
@@ -453,16 +438,15 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[SLAVE_BUILD]/src/tools/swarming_client",
+ "[CWD]/src/tools/swarming_client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[SLAVE_BUILD]/src/out/Release/telemetry_gpu_unittests.isolated.gen.json"
+ "[CWD]/src/out/Release/telemetry_gpu_unittests.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -477,14 +461,13 @@
"-u",
"import sys; sys.exit(0)"
],
- "cwd": "[SLAVE_BUILD]",
"name": "mark: before_tests"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[CWD]/src/tools/swarming_client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -552,7 +535,6 @@
"--build-revision=\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"",
"--isolated-script-test-output=${ISOLATED_OUTDIR}/output.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] telemetry_gpu_unittests (with patch) on Ubuntu-12.04",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -573,7 +555,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+ "[CWD]/src/tools/swarming_client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -585,7 +567,6 @@
"--task-output-dir",
"/path/to/tmp/"
],
- "cwd": "[SLAVE_BUILD]",
"name": "telemetry_gpu_unittests (with patch) on Ubuntu-12.04",
"~followup_annotations": [
"@@@STEP_LOG_LINE@outdir_json@{@@@",
« no previous file with comments | « scripts/slave/recipes/chromium_trybot.expected/dont_analyze_for_non_src_project.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_blink_linux_blink_compile_dbg.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698