scripts/slave/recipes/bisection/desktop_bisect.expected/basic_perf_tryjob_with_revisions.json - Issue 1917243002: Revert "build: roll infra_paths changes"

Unified Diff: scripts/slave/recipes/bisection/desktop_bisect.expected/basic_perf_tryjob_with_revisions.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/bisection/desktop_bisect.expected/basic_perf_tryjob_with_metric.json ('k') | scripts/slave/recipes/bisection/desktop_bisect.expected/perf_cq_no_benchmark_to_run.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/bisection/desktop_bisect.expected/basic_perf_tryjob_with_revisions.json

diff --git a/scripts/slave/recipes/bisection/desktop_bisect.expected/basic_perf_tryjob_with_revisions.json b/scripts/slave/recipes/bisection/desktop_bisect.expected/basic_perf_tryjob_with_revisions.json

index 2a369bb82cf2f5c5d1b2f1d5ab53c34094d75895..f6867bad11dc84a7017893e71efd498639293b88 100644

--- a/scripts/slave/recipes/bisection/desktop_bisect.expected/basic_perf_tryjob_with_revisions.json

+++ b/scripts/slave/recipes/bisection/desktop_bisect.expected/basic_perf_tryjob_with_revisions.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', '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 = '[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'}]",

"--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@@@",

@@ -162,10 +166,11 @@

"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='[ROOT]/b/build/slave/cache/cipd/goma' target_arch=x64 use_goma=1",

+ "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

"name": "gclient runhooks (with patch)"

@@ -177,7 +182,7 @@

"--cached",

"--name-only"

- "cwd": "[CWD]/src",

+ "cwd": "[SLAVE_BUILD]/src",

"name": "git diff to analyze patch",

"stdout": "/path/to/tmp/",

"~followup_annotations": [

@@ -191,10 +196,11 @@

"-u",

"RECIPE_MODULE[build::perf_try]/resources/load_config_to_json.py",

"--source",

- "[CWD]/src/tools/run-perf-test.cfg",

+ "[SLAVE_BUILD]/src/tools/run-perf-test.cfg",

"--output_json",

"/path/to/tmp/json"

+ "cwd": "[SLAVE_BUILD]",

"name": "load config",

"~followup_annotations": [

"@@@STEP_LOG_LINE@json.output@{@@@",

@@ -220,7 +226,7 @@

"-1",

"origin/master"

- "cwd": "[CWD]/src",

+ "cwd": "[SLAVE_BUILD]/src",

"name": "resolving commit_pos 306476",

"stdout": "/path/to/tmp/"

@@ -234,7 +240,7 @@

"-1",

"origin/master"

- "cwd": "[CWD]/src",

+ "cwd": "[SLAVE_BUILD]/src",

"name": "resolving commit_pos 306475",

"stdout": "/path/to/tmp/"

@@ -250,13 +256,13 @@

"--slave",

"TestSlavename",

"--spec",

"--root",

"src",

"--revision_mapping_file",

"--git-cache-dir",

- "[ROOT]/b/build/slave/cache_dir",

+ "[GIT_CACHE]",

"--rietveld_server",

"https://codereview.chromium.org",

"--output_json",

@@ -266,6 +272,7 @@

"--force",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -332,10 +339,11 @@

"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='[ROOT]/b/build/slave/cache/cipd/goma' target_arch=x64 use_goma=1",

+ "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

"name": "gclient runhooks on bad49c331def2a3bbf3ddd0096eb51551155"

@@ -349,24 +357,26 @@

"python",

"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"

+ "cwd": "[SLAVE_BUILD]",

"name": "cleanup_temp"

{

"cmd": [

"python",

"-u",

- "[CWD]/src/tools/mb/mb.py",

+ "[SLAVE_BUILD]/src/tools/mb/mb.py",

"gen",

"-m",

"tryserver.chromium.perf",

"-b",

"linux_perf_bisect",

"--config-file",

- "[CWD]/src/tools/mb/mb_config.pyl",

+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",

"--goma-dir",

- "[ROOT]/b/build/slave/cache/cipd/goma",

+ "[CACHE]/cipd/goma",

"//out/Release"

+ "cwd": "[SLAVE_BUILD]",

"name": "generate_build_files bad49c331def2a3bbf3ddd0096eb51551155"

{

@@ -384,9 +394,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",

@@ -398,7 +408,7 @@

"--mode",

"official",

"--goma-dir",

- "[ROOT]/b/build/slave/cache/cipd/goma",

+ "[CACHE]/cipd/goma",

"--goma-hermetic",

"fallback",

"--goma-fail-fast",

@@ -406,6 +416,7 @@

"--",

"chromium_builder_perf"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"

@@ -432,7 +443,7 @@

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

- "[CWD]/src/tools/perf/run_benchmark",

+ "[SLAVE_BUILD]/src/tools/perf/run_benchmark",

"-v",

"--browser=release",

"sunspider",

@@ -440,6 +451,7 @@

"--upload-results",

"--results-label=bad49c331def2a3bbf3ddd0096eb51551155"

+ "cwd": "[SLAVE_BUILD]",

"name": "Performance Test (bad49c331def2a3bbf3ddd0096eb51551155) 1 of 1",

"stderr": "/path/to/tmp/",

"stdout": "/path/to/tmp/",

@@ -466,13 +478,13 @@

"--slave",

"TestSlavename",

"--spec",

"--root",

"src",

"--revision_mapping_file",

"--git-cache-dir",

- "[ROOT]/b/build/slave/cache_dir",

+ "[GIT_CACHE]",

"--rietveld_server",

"https://codereview.chromium.org",

"--output_json",

@@ -482,6 +494,7 @@

"--force",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -548,10 +561,11 @@

"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='[ROOT]/b/build/slave/cache/cipd/goma' target_arch=x64 use_goma=1",

+ "GYP_DEFINES": "branding=Chrome buildtype=Official component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

"name": "gclient runhooks on d49c331def2a3bbf3ddd0096eb51551155"

@@ -565,24 +579,26 @@

"python",

"RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"

+ "cwd": "[SLAVE_BUILD]",

"name": "cleanup_temp (2)"

{

"cmd": [

"python",

"-u",

- "[CWD]/src/tools/mb/mb.py",

+ "[SLAVE_BUILD]/src/tools/mb/mb.py",

"gen",

"-m",

"tryserver.chromium.perf",

"-b",

"linux_perf_bisect",

"--config-file",

- "[CWD]/src/tools/mb/mb_config.pyl",

+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",

"--goma-dir",

- "[ROOT]/b/build/slave/cache/cipd/goma",

+ "[CACHE]/cipd/goma",

"//out/Release"

+ "cwd": "[SLAVE_BUILD]",

"name": "generate_build_files d49c331def2a3bbf3ddd0096eb51551155"

{

@@ -600,9 +616,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",

@@ -614,7 +630,7 @@

"--mode",

"official",

"--goma-dir",

- "[ROOT]/b/build/slave/cache/cipd/goma",

+ "[CACHE]/cipd/goma",

"--goma-hermetic",

"fallback",

"--goma-fail-fast",

@@ -622,6 +638,7 @@

"--",

"chromium_builder_perf"

+ "cwd": "[SLAVE_BUILD]",

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"

@@ -648,13 +665,14 @@

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

- "[CWD]/src/tools/perf/run_benchmark",

+ "[SLAVE_BUILD]/src/tools/perf/run_benchmark",

"-v",

"--browser=release",

"sunspider",

"--upload-results",

"--results-label=d49c331def2a3bbf3ddd0096eb51551155"

+ "cwd": "[SLAVE_BUILD]",

"name": "Performance Test (d49c331def2a3bbf3ddd0096eb51551155) 1 of 1",

"stderr": "/path/to/tmp/",

"stdout": "/path/to/tmp/",

@@ -671,6 +689,7 @@

{

"cmd": [],

+ "cwd": "[SLAVE_BUILD]",

"name": "Results",

"~followup_annotations": [

"@@@STEP_TEXT@",

@@ -692,6 +711,7 @@

"-u",

"RECIPE_MODULE[build::perf_dashboard]/resources/post_json.py"

+ "cwd": "[SLAVE_BUILD]",

"name": "Post bisect results",

"stdin": "{\"data\": {\"bisect_bot\": \"linux_perf_bisect\", \"buildbot_log_url\": \"http://c.org/p/cr/builders/linux_perf_bisect/builds/571\", \"change\": 0.0, \"cloud_link\": \"http://storage.googleapis.com/chromium-telemetry/html-results/results-without_patch\", \"command\": \"src/tools/perf/run_benchmark -v --browser=release sunspider\", \"metric\": \"dummy/dummy\", \"profiler_links\": [], \"result\": \"Revision Mean Std.Error\\nPatch 5.805333333330.127614436662\\nNo Patch 5.805333333330.127614436662\", \"status\": \"completed\", \"std_err\": 0.1804740670813644, \"try_job_id\": null}, \"url\": \"https://chromeperf.appspot.com/post_bisect_results\"}",

"stdout": "/path/to/tmp/json",