Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2103133005: Build delegation for perf tryjobs - fix false account name (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Update simulation test expectation files 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') | Show Comments 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 3e11d77a1d478c6c855e33dc02d5a0d2d0981603..5c46cc8364e3b5d0ca28a38089425e2b61c167ce 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",
- "12853011",
+ "12345",
"--patchset",
- "1",
+ "20001",
"--rietveld_server",
"https://codereview.chromium.org",
"--output_json",
@@ -360,6 +360,23 @@
"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",
@@ -369,24 +386,82 @@
},
{
"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",
- "[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"
+ "\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"
],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "generate_build_files bad49c331def2a3bbf3ddd0096eb51551155"
+ "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@@@@",
+ "@@@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@@@"
+ ]
},
{
"cmd": [
@@ -395,44 +470,19 @@
"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
"--show-path",
"python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/extract_build.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",
- "--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"
+ "--build-archive-url",
+ "gs://chrome-perf/Linux Builder/full-build-linuxbad49c331def2a3bbf3ddd0096eb51551155.zip",
+ "--master-name",
+ "tryserver.chromium.perf",
+ "--build-number",
+ "571"
],
- "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)@@@"
- ]
+ "name": "extract build"
},
{
"cmd": [
@@ -443,9 +493,9 @@
"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, \"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\"}",
"--build-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, \"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\"}",
"--step-name=Performance Test (bad49c331def2a3bbf3ddd0096eb51551155) 1 of 1",
"--builder-name=linux_perf_bisect",
"--slave-name=TestSlavename",
@@ -586,33 +636,33 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
+ "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"
],
- "name": "cleanup_temp (2)"
+ "name": "gsutil exists (2)"
},
{
"cmd": [
"python",
"-u",
- "[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"
+ "\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"
],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "generate_build_files d49c331def2a3bbf3ddd0096eb51551155"
+ "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@@@@",
+ "@@@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@@@"
+ ]
},
{
"cmd": [
@@ -621,44 +671,19 @@
"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
"--show-path",
"python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/extract_build.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",
- "--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"
+ "--build-archive-url",
+ "gs://chrome-perf/Linux Builder/full-build-linuxd49c331def2a3bbf3ddd0096eb51551155.zip",
+ "--master-name",
+ "tryserver.chromium.perf",
+ "--build-number",
+ "571"
],
- "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)@@@"
- ]
+ "name": "extract build (2)"
},
{
"cmd": [
@@ -669,9 +694,9 @@
"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, \"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\"}",
"--build-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, \"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\"}",
"--step-name=Performance Test (d49c331def2a3bbf3ddd0096eb51551155) 1 of 1",
"--builder-name=linux_perf_bisect",
"--slave-name=TestSlavename",
« 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 »

Powered by Google App Engine
This is Rietveld 408576698