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

Unified Diff: scripts/slave/recipes/bisection/desktop_bisect.expected/basic_perf_tryjob.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_linux_bisect_tester_recipe_ret_code.json ('k') | scripts/slave/recipes/bisection/desktop_bisect.expected/basic_perf_tryjob_with_metric.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.json

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

index 2b39fe4a9e512e540748e4951b72a52d72a7ab9a..ab6e63e39fb82111a0267d1c221a4f3d2b4c058a 100644

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

+++ b/scripts/slave/recipes/bisection/desktop_bisect.expected/basic_perf_tryjob.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@{@@@",

@@ -216,6 +222,7 @@

"python",

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

+ "cwd": "[SLAVE_BUILD]",

"name": "cleanup_temp"

{

@@ -223,8 +230,9 @@

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

- "[CWD]/src/out/Release"

+ "[SLAVE_BUILD]/src/out/Release"

+ "cwd": "[SLAVE_BUILD]",

"name": "rmtree build directory",

"~followup_annotations": [

"@@@STEP_LOG_LINE@python.inline@@@@",

@@ -241,18 +249,19 @@

"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 (with patch)"

{

@@ -270,9 +279,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",

@@ -284,7 +293,7 @@

"--mode",

"official",

"--goma-dir",

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

+ "[CACHE]/cipd/goma",

"--goma-hermetic",

"fallback",

"--goma-fail-fast",

@@ -292,6 +301,7 @@

"--",

"chromium_builder_perf"

+ "cwd": "[SLAVE_BUILD]",

"env": {

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

@@ -318,7 +328,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",

@@ -326,6 +336,7 @@

"--upload-results",

"--results-label=Patch"

+ "cwd": "[SLAVE_BUILD]",

"name": "Performance Test (With Patch) 1 of 1",

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

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

@@ -352,13 +363,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",

@@ -368,6 +379,7 @@

"--force",

"--output_manifest"

+ "cwd": "[SLAVE_BUILD]",

"env": {

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

@@ -434,10 +446,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 (without patch)"

@@ -451,24 +464,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 Without Patch"

{

@@ -486,9 +501,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",

@@ -500,7 +515,7 @@

"--mode",

"official",

"--goma-dir",

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

+ "[CACHE]/cipd/goma",

"--goma-hermetic",

"fallback",

"--goma-fail-fast",

@@ -508,6 +523,7 @@

"--",

"chromium_builder_perf"

+ "cwd": "[SLAVE_BUILD]",

"env": {

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

@@ -534,13 +550,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=TOT"

+ "cwd": "[SLAVE_BUILD]",

"name": "Performance Test (Without Patch) 1 of 1",

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

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

@@ -557,6 +574,7 @@

{

"cmd": [],

+ "cwd": "[SLAVE_BUILD]",

"name": "Results",

"~followup_annotations": [

"@@@STEP_TEXT@No values from test with patch, or none from test without patch.",

@@ -584,6 +602,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\", \"cloud_link\": \"http://storage.googleapis.com/chromium-telemetry/html-results/results-without_patch\", \"command\": \"src/tools/perf/run_benchmark -v --browser=release sunspider\", \"metric\": null, \"status\": \"completed\", \"try_job_id\": null, \"warnings\": [\"No values from test with patch, or none from test without patch.\\n Output with patch:\\n*RESULT dummy: dummy= [5.83,6.013,5.573]ms\\nAvg dummy: 5.907711ms\\nSd dummy: 0.255921ms\\nRESULT telemetry_page_measurement_results: num_failed= 0 count\\nRESULT telemetry_page_measurement_results: num_errored= 0 count\\n\\nView online at http://storage.googleapis.com/chromium-telemetry/html-results/results-with_patch\\n\\n\\nOutput without patch:\\n*RESULT dummy: dummy= [5.83,6.013,5.573]ms\\nAvg dummy: 5.907711ms\\nSd dummy: 0.255921ms\\nRESULT telemetry_page_measurement_results: num_failed= 0 count\\nRESULT telemetry_page_measurement_results: num_errored= 0 count\\n\\nView online at http://storage.googleapis.com/chromium-telemetry/html-results/results-without_patch\\n\"]}, \"url\": \"https://chromeperf.appspot.com/post_bisect_results\"}",

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