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

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

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

index 7b46541a2a520f7fb35bf11f481303c2781036ae..9af2f1e5dd619d9e4278fdd2613069a9b71cf7c5 100644

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

+++ b/scripts/slave/recipes/bisection/desktop_bisect.expected/basic.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": [

@@ -202,13 +225,67 @@

"cmd": [

"python",

"-u",

- "[SLAVE_BUILD]/src/tools/prepare-bisect-perf-regression.py",

+ "[BUILDER_CACHE]/linux_perf_bisect/src/tools/prepare-bisect-perf-regression.py",

"-w",

- "[SLAVE_BUILD]"

+ "[CACHE]/bisect"

"name": "Preparing for Bisection"

{

+ "cmd": [],

+ "name": "ensure_goma (2)"

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

+ "RECIPE_MODULE[build::cipd]/resources/bootstrap.py",

+ "--platform",

+ "linux-amd64",

+ "--dest-directory",

+ "[SLAVE_BUILD]/cipd",

+ "--json-output",

+ "/path/to/tmp/json"

+ ],

+ "name": "ensure_goma.install cipd (2)",

+ "~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@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",

+ "@@@STEP_LOG_LINE@json.output@}@@@",

+ "@@@STEP_LOG_END@json.output@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "[SLAVE_BUILD]/cipd/cipd",

+ "ensure",

+ "--root",

+ "[CACHE]/cipd/goma",

+ "--list",

+ "infra_internal/goma/client/linux-amd64 release",

+ "--json-output",

+ "/path/to/tmp/json",

+ "--service-account-json",

+ "/creds/service_accounts/service-account-goma-client.json"

+ ],

+ "name": "ensure_goma.ensure_installed (2)",

+ "~followup_annotations": [

+ "@@@STEP_NEST_LEVEL@1@@@",

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

+ "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",

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

+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",

+ "@@@STEP_LOG_LINE@json.output@ }@@@",

+ "@@@STEP_LOG_LINE@json.output@ ]@@@",

+ "@@@STEP_LOG_LINE@json.output@}@@@",

+ "@@@STEP_LOG_END@json.output@@@"

+ ]

+ },

+ {

"allow_subannotations": true,

"cmd": [

"python",

@@ -218,21 +295,21 @@

"Release",

"--xvfb",

"--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_perf_bisect\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patchset\": 1, \"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, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patchset\": 1, \"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=Running Bisection",

"--builder-name=linux_perf_bisect",

"--slave-name=TestSlavename",

"--build-number=571",

"--run-python-script",

- "[SLAVE_BUILD]/src/tools/run-bisect-perf-regression.py",

+ "[BUILDER_CACHE]/linux_perf_bisect/src/tools/run-bisect-perf-regression.py",

"-w",

- "[SLAVE_BUILD]",

+ "[CACHE]/bisect",

"--path_to_goma",

- "[BUILD]/goma",

+ "[CACHE]/cipd/goma",

"--build-properties",

"name": "Running Bisection"