scripts/slave/recipes/bisection/desktop_bisect.expected/basic_perf_tryjob_with_revisions.json - Issue 2228473002: bisection: prepare for running under remote_run

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

Issue 2228473002: bisection: prepare for running under remote_run (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: Created 4 years, 4 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/auto_bisect/api.py ('K') | « 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 874f3f9edc21dda8b7754792cc1cd12ddab6c183..4c60ac0e1a13d1118975f3bfc3a5fd4ce748d1c3 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

@@ -3,6 +3,28 @@

"cmd": [

"python",

"-u",

+ "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",

+ "[BUILDER_CACHE]/linux_perf_bisect",

+ "511"

+ ],

+ "name": "makedirs checkout path",

+ "~followup_annotations": [

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

+ "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",

+ "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",

+ "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",

+ "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",

+ "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",

+ "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",

+ "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",

+ "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",

+ "@@@STEP_LOG_END@python.inline@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",

"--master",

"tryserver.chromium.perf",

@@ -30,6 +52,7 @@

"src@HEAD",

"--output_manifest"

+ "cwd": "[BUILDER_CACHE]/linux_perf_bisect",

"env": {

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

@@ -170,7 +193,7 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

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

+ "cwd": "[BUILDER_CACHE]/linux_perf_bisect/src",

"env": {

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

"GYP_CHROMIUM_NO_ACTION": "1",

@@ -186,7 +209,7 @@

"--cached",

"--name-only"

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

+ "cwd": "[BUILDER_CACHE]/linux_perf_bisect/src",

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

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

"~followup_annotations": [

@@ -204,7 +227,7 @@

"-u",

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

"--source",

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

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

"--output_json",

"/path/to/tmp/json"

@@ -233,7 +256,7 @@

"-1",

"origin/master"

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

+ "cwd": "[BUILDER_CACHE]/linux_perf_bisect/src",

"name": "resolving commit_pos 306476",

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

@@ -247,7 +270,7 @@

"-1",

"origin/master"

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

+ "cwd": "[BUILDER_CACHE]/linux_perf_bisect/src",

"name": "resolving commit_pos 306475",

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

@@ -351,7 +374,7 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

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

+ "cwd": "[BUILDER_CACHE]/linux_perf_bisect/src",

"env": {

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

"GYP_CHROMIUM_NO_ACTION": "1",

@@ -455,7 +478,7 @@

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

+ "[BUILDER_CACHE]/linux_perf_bisect/src/out/Release"

"name": "rmtree build directory",

"~followup_annotations": [

@@ -482,7 +505,7 @@

"--target",

"Release",

"--src-dir",

- "[SLAVE_BUILD]/src",

+ "[BUILDER_CACHE]/linux_perf_bisect/src",

"--build-archive-url",

"gs://chrome-perf/Linux Builder/full-build-linuxbad49c331def2a3bbf3ddd0096eb51551155.zip",

"--master-name",

@@ -501,15 +524,15 @@

"Release",

"--xvfb",

"--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_perf_bisect\", \"buildnumber\": 571, \"is_test\": true, \"issue\": \"12345\", \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patch_storage\": \"rietveld\", \"patchset\": \"20001\", \"project\": \"chrome\", \"recipe\": \"bisection/desktop_bisect\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_perf_bisect\", \"buildnumber\": 571, \"is_test\": true, \"issue\": \"12345\", \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patch_storage\": \"rietveld\", \"patchset\": \"20001\", \"path_config\": \"kitchen\", \"project\": \"chrome\", \"recipe\": \"bisection/desktop_bisect\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

"--build-properties",

"--step-name=Performance Test (bad49c331def2a3bbf3ddd0096eb51551155) 1 of 1",

"--builder-name=linux_perf_bisect",

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

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

+ "[BUILDER_CACHE]/linux_perf_bisect/src/tools/perf/run_benchmark",

"-v",

"--browser=release",

"sunspider",

@@ -631,7 +654,7 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

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

+ "cwd": "[BUILDER_CACHE]/linux_perf_bisect/src",

"env": {

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

"GYP_CHROMIUM_NO_ACTION": "1",

@@ -658,7 +681,7 @@

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

+ "[BUILDER_CACHE]/linux_perf_bisect/src/out/Release"

"name": "rmtree build directory (2)",

"~followup_annotations": [

@@ -685,7 +708,7 @@

"--target",

"Release",

"--src-dir",

- "[SLAVE_BUILD]/src",

+ "[BUILDER_CACHE]/linux_perf_bisect/src",

"--build-archive-url",

"gs://chrome-perf/Linux Builder/full-build-linuxd49c331def2a3bbf3ddd0096eb51551155.zip",

"--master-name",

@@ -704,15 +727,15 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--step-name=Performance Test (d49c331def2a3bbf3ddd0096eb51551155) 1 of 1",

"--builder-name=linux_perf_bisect",

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

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

+ "[BUILDER_CACHE]/linux_perf_bisect/src/tools/perf/run_benchmark",

"-v",

"--browser=release",

"sunspider",