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

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

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

index d59bf463628bf517497d2ec8add816fae849cedf..c93035696a2adcf401b814fecb935067f085f7c1 100644

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

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

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

@@ -230,7 +253,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": [

@@ -257,7 +280,7 @@

"--target",

"Release",

"--src-dir",

- "[SLAVE_BUILD]/src",

+ "[BUILDER_CACHE]/linux_perf_bisect/src",

"--build-archive-url",

"gs://test-domain/test-archive.zip",

"--master-name",

@@ -276,9 +299,9 @@

"Release",

"--xvfb",

"--factory-properties",

- "{\"bisect_config\": {\"bug_id\": \"425582\", \"builder_host\": \"master4.golo.chromium.org\", \"builder_port\": \"8341\", \"command\": \"./tools/perf/run_benchmark -v --browser=release page_cycler.intl_ar_fa_he\", \"gs_bucket\": \"chrome-perf\", \"max_time_minutes\": \"5\", \"metric\": \"warm_times/page_load_time\", \"repeat_count\": \"2\", \"test_type\": \"perf\", \"truncate_percent\": \"25\"}, \"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_perf_bisect\", \"buildnumber\": 571, \"issue\": 12853011, \"job_name\": \"f7a7b4135624439cbd27fdd5133d74ec\", \"mastername\": \"tryserver.chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_got_revision\": \"1111111\", \"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\"}",

+ "{\"bisect_config\": {\"bug_id\": \"425582\", \"builder_host\": \"master4.golo.chromium.org\", \"builder_port\": \"8341\", \"command\": \"./tools/perf/run_benchmark -v --browser=release page_cycler.intl_ar_fa_he\", \"gs_bucket\": \"chrome-perf\", \"max_time_minutes\": \"5\", \"metric\": \"warm_times/page_load_time\", \"repeat_count\": \"2\", \"test_type\": \"perf\", \"truncate_percent\": \"25\"}, \"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_perf_bisect\", \"buildnumber\": 571, \"issue\": 12853011, \"job_name\": \"f7a7b4135624439cbd27fdd5133d74ec\", \"mastername\": \"tryserver.chromium.perf\", \"parent_build_archive_url\": \"gs://test-domain/test-archive.zip\", \"parent_got_revision\": \"1111111\", \"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=Performance Test 1 of 2",

"--builder-name=linux_perf_bisect",

"--slave-name=TestSlavename",

@@ -289,6 +312,7 @@

"--browser=release",

"page_cycler.intl_ar_fa_he"

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

"env": {

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

@@ -308,9 +332,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

"--step-name=Performance Test 2 of 2",

"--builder-name=linux_perf_bisect",

"--slave-name=TestSlavename",

@@ -321,6 +345,7 @@

"--browser=release",

"page_cycler.intl_ar_fa_he"

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

"env": {

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

@@ -337,6 +362,7 @@

"-u",

"RECIPE_MODULE[build::bisect_tester]/resources/put_temp.py"

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

"env": {

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

@@ -356,6 +382,7 @@

"/tmp/dummy2",

"gs://chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec.results"

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

"env": {

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