scripts/slave/recipes/bisection/desktop_bisect.expected/basic_perf_tryjob_with_revisions.json - Issue 2113553002: Revert of Build delegation for perf tryjobs - fix false account name

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

Issue 2113553002: Revert of Build delegation for perf tryjobs - fix false account name (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master

Patch Set: Manually reverting Created 4 years, 6 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_tryjob_failed_test.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 e25c09fa83164a7d86ea50b3abf867debd8d1d1f..3e11d77a1d478c6c855e33dc02d5a0d2d0981603 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

@@ -19,9 +19,9 @@

"--git-cache-dir",

"[GIT_CACHE]",

"--issue",

- "12345",

+ "12853011",

"--patchset",

- "20001",

+ "1",

"--rietveld_server",

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

"--output_json",

@@ -360,23 +360,6 @@

"cmd": [

"python",

"-u",

- "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",

- "--",

- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",

- "----",

- "ls",

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

- ],

- "name": "gsutil exists",

- "~followup_annotations": [

- "step returned non-zero exit code: 1",

- "@@@STEP_EXCEPTION@@@"

- ]

- },

- {

- "cmd": [

- "python",

- "-u",

"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",

"--show-path",

"python",

@@ -386,82 +369,24 @@

{

"cmd": [

- "/opt/infra-tools/buildbucket",

- "put",

- "--host",

- "cr-buildbucket.appspot.com",

- "--service-account-json",

- "/creds/service_accounts/service-account-chromium-bisect.json",

- "{\"bucket\": \"master.tryserver.chromium.perf\", \"client_operation_id\": \"123456\", \"parameters_json\": \"{\\\"buildername\\\": \\\"linux_perf_bisect_builder\\\", \\\"properties\\\": {\\\"build_archive_url\\\": \\\"gs://chrome-perf/Linux Builder/full-build-linuxbad49c331def2a3bbf3ddd0096eb51551155.zip\\\", \\\"clobber\\\": true, \\\"parent_got_revision\\\": \\\"bad49c331def2a3bbf3ddd0096eb51551155\\\"}}\", \"tags\": [\"master:tryserver.chromium.perf\", \"user_agent:recipe\"]}"

- ],

- "name": "buildbucket.put",

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

- "~followup_annotations": [

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

- "@@@STEP_LOG_LINE@json.output@ \"results\": [@@@",

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

- "@@@STEP_LOG_LINE@json.output@ \"build\": {@@@",

- "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"user.username\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"created_by\": \"user:username@example.com\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"created_ts\": \"1459200369835900\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"id\": \"9016911228971028736\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"parameters_json\": \"{\\\"This_has_been\\\": \\\"removed\\\"}\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"result_details_json\": \"null\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"status\": \"SCHEDULED\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"status_changed_ts\": \"1459200369835930\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"updated_ts\": \"1459200369835940\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"utcnow_ts\": \"1459200369962370\"@@@",

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

- "@@@STEP_LOG_LINE@json.output@ \"etag\": \"\\\"8uCIh8TRuYs4vPN3iWmly9SJMqw\\\"\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"kind\": \"buildbucket#resourcesItem\"@@@",

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

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

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

- "@@@STEP_LOG_END@json.output@@@"

- ]

- },

- {

- "cmd": [

- "/opt/infra-tools/buildbucket",

- "get",

- "--host",

- "cr-buildbucket.appspot.com",

- "9016911228971028736"

- ],

- "name": "buildbucket.get",

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

- "~followup_annotations": [

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

- "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"master.tryserver.chromium.perf\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"id\": \"9009962699124567824\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"result\": \"SUCCESS\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"status\": \"COMPLETED\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"status_changed_utc\": \"Mon Jun 13 19:32:37 2016\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"updated_utc\": \"Mon Jun 13 19:32:37 2016\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"url\": \"http://build.chromium.org/p/tryserver.chromium.perf/builders/linux_perf_bisect/builds/6537\", @@@",

- "@@@STEP_LOG_LINE@json.output@ \"utcnow_utc\": \"Tue Jun 21 21:33:56 2016\"@@@",

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

- "@@@STEP_LOG_END@json.output@@@"

- ]

- },

- {

- "cmd": [

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

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

+ "gen",

+ "-m",

+ "tryserver.chromium.perf",

+ "-b",

+ "linux_perf_bisect",

+ "--config-file",

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

+ "--goma-dir",

+ "[CACHE]/cipd/goma",

+ "//out/Release"

- "name": "rmtree build directory",

- "~followup_annotations": [

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

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

- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",

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

- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",

- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",

- "@@@STEP_LOG_END@python.inline@@@"

- ]

+ "env": {

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

+ },

+ "name": "generate_build_files bad49c331def2a3bbf3ddd0096eb51551155"

{

"cmd": [

@@ -470,21 +395,44 @@

"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",

"--show-path",

"python",

- "RECIPE_PACKAGE_REPO[build]/scripts/slave/extract_build.py",

+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",

"--gsutil-py-path",

"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",

+ "--ninja-path",

+ "RECIPE_PACKAGE_REPO[depot_tools]/ninja",

"--target",

"Release",

"--src-dir",

"[SLAVE_BUILD]/src",

- "--build-archive-url",

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

- "--master-name",

- "tryserver.chromium.perf",

- "--build-number",

- "571"

+ "--goma-cache-dir",

+ "[GOMA_CACHE]",

+ "--build-tool",

+ "ninja",

+ "--compiler",

+ "goma",

+ "--goma-jsonstatus",

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

+ "--goma-service-account-json-file",

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

+ "--mode",

+ "official",

+ "--goma-dir",

+ "[CACHE]/cipd/goma",

+ "--goma-hermetic",

+ "fallback",

+ "--goma-fail-fast",

+ "--goma-disable-local-fallback",

+ "--",

+ "chromium_builder_perf"

- "name": "extract build"

+ "env": {

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

+ },

+ "name": "compile bad49c331def2a3bbf3ddd0096eb51551155",

+ "~followup_annotations": [

+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",

+ "@@@STEP_LOG_END@json.output (invalid)@@@"

+ ]

{

"cmd": [

@@ -495,9 +443,9 @@

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

"--build-properties",

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

"--builder-name=linux_perf_bisect",

"--slave-name=TestSlavename",

@@ -638,33 +586,33 @@

"cmd": [

"python",

"-u",

- "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",

- "--",

- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",

- "----",

- "ls",

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

+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",

+ "--show-path",

+ "python",

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

- "name": "gsutil exists (2)"

+ "name": "cleanup_temp (2)"

{

"cmd": [

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

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

+ "gen",

+ "-m",

+ "tryserver.chromium.perf",

+ "-b",

+ "linux_perf_bisect",

+ "--config-file",

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

+ "--goma-dir",

+ "[CACHE]/cipd/goma",

+ "//out/Release"

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

- "~followup_annotations": [

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

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

- "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",

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

- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",

- "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",

- "@@@STEP_LOG_END@python.inline@@@"

- ]

+ "env": {

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

+ },

+ "name": "generate_build_files d49c331def2a3bbf3ddd0096eb51551155"

{

"cmd": [

@@ -673,21 +621,44 @@

"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",

"--show-path",

"python",

- "RECIPE_PACKAGE_REPO[build]/scripts/slave/extract_build.py",

+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",

"--gsutil-py-path",

"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",

+ "--ninja-path",

+ "RECIPE_PACKAGE_REPO[depot_tools]/ninja",

"--target",

"Release",

"--src-dir",

"[SLAVE_BUILD]/src",

- "--build-archive-url",

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

- "--master-name",

- "tryserver.chromium.perf",

- "--build-number",

- "571"

+ "--goma-cache-dir",

+ "[GOMA_CACHE]",

+ "--build-tool",

+ "ninja",

+ "--compiler",

+ "goma",

+ "--goma-jsonstatus",

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

+ "--goma-service-account-json-file",

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

+ "--mode",

+ "official",

+ "--goma-dir",

+ "[CACHE]/cipd/goma",

+ "--goma-hermetic",

+ "fallback",

+ "--goma-fail-fast",

+ "--goma-disable-local-fallback",

+ "--",

+ "chromium_builder_perf"

- "name": "extract build (2)"

+ "env": {

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

+ },

+ "name": "compile d49c331def2a3bbf3ddd0096eb51551155",

+ "~followup_annotations": [

+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",

+ "@@@STEP_LOG_END@json.output (invalid)@@@"

+ ]

{

"cmd": [

@@ -698,9 +669,9 @@

"Release",

"--xvfb",

"--factory-properties",

"--build-properties",

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

"--builder-name=linux_perf_bisect",

"--slave-name=TestSlavename",