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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromeos_amd64_generic_chromium_compile_only_ng.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_trybot.expected/full_tryserver_chromium_linux_cast_shell_linux.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromeos_daisy_chromium_compile_only_ng.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/full_tryserver_chromium_linux_chromeos_amd64_generic_chromium_compile_only_ng.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromeos_amd64_generic_chromium_compile_only_ng.json b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromeos_amd64_generic_chromium_compile_only_ng.json
index 1bb98fb9d34e74ae81f132ecaca64028f59ca960..c0e629f69d0bdfd58c5f45bbdf1047ceb0d90486 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromeos_amd64_generic_chromium_compile_only_ng.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromeos_amd64_generic_chromium_compile_only_ng.json
@@ -11,13 +11,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]",
"--issue",
"12853011",
"--patchset",
@@ -30,6 +30,7 @@
"src@HEAD",
"--output_manifest"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -103,6 +104,7 @@
},
{
"cmd": [],
+ "cwd": "[SLAVE_BUILD]",
"name": "ensure_goma"
},
{
@@ -113,16 +115,17 @@
"--platform",
"linux-amd64",
"--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@@@"
@@ -130,10 +133,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/linux-amd64 release",
"--json-output",
@@ -141,6 +144,7 @@
"--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@@@",
@@ -164,7 +168,7 @@
"--use-external-config",
"--clear-sdk-cache",
"--gomadir",
- "[ROOT]/b/build/slave/cache/cipd/goma",
+ "[CACHE]/cipd/goma",
"--fastbuild",
"--",
"python",
@@ -172,6 +176,7 @@
"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",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
@@ -182,7 +187,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",
"--",
@@ -190,10 +195,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\": \"chromeos_amd64-generic_chromium_compile_only_ng\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.linux\", \"slavename\": \"TestSlavename\", \"target_platform\": \"chromeos\"}"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{}@@@",
@@ -205,12 +211,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/src/testing/buildbot/chromium.chromiumos.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.chromiumos.json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [CWD]/src/testing/buildbot/chromium.chromiumos.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.chromiumos.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -222,7 +229,7 @@
"--cached",
"--name-only"
],
- "cwd": "[CWD]/src",
+ "cwd": "[SLAVE_BUILD]/src",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -236,9 +243,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/src/testing/buildbot/trybot_analyze_config.json",
+ "[SLAVE_BUILD]/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'@@@",
@@ -261,6 +269,7 @@
"-u",
"import sys; sys.exit(0)"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "analyze",
"~followup_annotations": [
"@@@STEP_LOG_LINE@excluded_files@foo.cc (regex = 'f.*')@@@",
@@ -290,6 +299,7 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -300,7 +310,7 @@
"--nocolor",
"--use-external-config",
"--gomadir",
- "[ROOT]/b/build/slave/cache/cipd/goma",
+ "[CACHE]/cipd/goma",
"--fastbuild",
"--",
"python",
@@ -316,9 +326,9 @@
"--target",
"Release",
"--src-dir",
- "[CWD]/src",
+ "[SLAVE_BUILD]/src",
"--goma-cache-dir",
- "[ROOT]/b/build/slave/goma_cache",
+ "[GOMA_CACHE]",
"--build-tool",
"ninja",
"--compiler",
@@ -328,7 +338,7 @@
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
"--goma-dir",
- "[ROOT]/b/build/slave/cache/cipd/goma",
+ "[CACHE]/cipd/goma",
"--goma-fail-fast",
"--goma-disable-local-fallback",
"--ninja-ensure-up-to-date",
@@ -337,6 +347,7 @@
"--",
"chromiumos_preflight"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -352,6 +363,7 @@
"-u",
"import sys; sys.exit(0)"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "mark: before_tests"
},
{
« no previous file with comments | « scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_cast_shell_linux.json ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_linux_chromeos_daisy_chromium_compile_only_ng.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698