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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/bisection/desktop_bisect.expected/perf_cq_run_benchmark.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
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
« scripts/slave/recipe_modules/ios/api.py ('K') | « scripts/slave/recipes/bisection/desktop_bisect.expected/perf_cq_no_changes.json ('k') | scripts/slave/recipes/bisection/desktop_bisect.expected/perf_tryjob_config_error.json » ('j') | scripts/slave/recipes/blink_downstream.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/bisection/desktop_bisect.expected/perf_cq_run_benchmark.json
diff --git a/scripts/slave/recipes/bisection/desktop_bisect.expected/perf_cq_run_benchmark.json b/scripts/slave/recipes/bisection/desktop_bisect.expected/perf_cq_run_benchmark.json
index db612e85e595c140764638243524a9dfc3dd6fe2..37fb79e6eb0fea285214b793fcca9363b543a81e 100644
--- a/scripts/slave/recipes/bisection/desktop_bisect.expected/perf_cq_run_benchmark.json
+++ b/scripts/slave/recipes/bisection/desktop_bisect.expected/perf_cq_run_benchmark.json
@@ -11,13 +11,13 @@
"--slave",
"TestSlavename",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', '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': False, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]",
+ "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'llvm_url': 'svn://svn-mirror.golo.chromium.org/llvm-project', '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': False, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': False, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]",
"--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@@@",
@@ -166,11 +162,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": "branding=Chrome buildtype=Official component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
+ "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library gomadir='[ROOT]/b/build/slave/cache/cipd/goma' target_arch=x64 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks (with patch)"
@@ -182,7 +177,7 @@
"--cached",
"--name-only"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "[CWD]/src",
"name": "git diff to analyze patch",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -199,7 +194,6 @@
"python",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "cwd": "[SLAVE_BUILD]",
"name": "cleanup_temp"
},
{
@@ -207,9 +201,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@@@@",
@@ -226,19 +219,18 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/mb/mb.py",
+ "[CWD]/src/tools/mb/mb.py",
"gen",
"-m",
"tryserver.chromium.perf",
"-b",
"linux_perf_bisect",
"--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",
"//out/Release"
],
- "cwd": "[SLAVE_BUILD]",
"name": "generate_build_files (with patch)"
},
{
@@ -256,9 +248,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",
@@ -270,7 +262,7 @@
"--mode",
"official",
"--goma-dir",
- "[CACHE]/cipd/goma",
+ "[ROOT]/b/build/slave/cache/cipd/goma",
"--goma-hermetic",
"fallback",
"--goma-fail-fast",
@@ -278,7 +270,6 @@
"--",
"chromium_builder_perf"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
@@ -292,7 +283,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/perf/run_benchmark",
+ "[CWD]/src/tools/perf/run_benchmark",
"list",
"--browser",
"release",
@@ -301,7 +292,6 @@
"--num-shards",
"1"
],
- "cwd": "[SLAVE_BUILD]",
"name": "List Perf Tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -362,7 +352,6 @@
"-v",
"--b=2"
],
- "cwd": "[SLAVE_BUILD]",
"name": "blink_perf.all.exact",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[]@@@",
@@ -395,7 +384,6 @@
"-v",
"--b=2"
],
- "cwd": "[SLAVE_BUILD]",
"name": "blink_perf.all.release",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[]@@@",
@@ -427,7 +415,6 @@
"--upload-results",
"blink_perf.dom"
],
- "cwd": "[SLAVE_BUILD]",
"name": "blink_perf.dom",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[]@@@",
« scripts/slave/recipe_modules/ios/api.py ('K') | « scripts/slave/recipes/bisection/desktop_bisect.expected/perf_cq_no_changes.json ('k') | scripts/slave/recipes/bisection/desktop_bisect.expected/perf_tryjob_config_error.json » ('j') | scripts/slave/recipes/blink_downstream.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698