scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_s5_perf_cq.json - Issue 2103133005: Build delegation for perf tryjobs - fix false account name

Unified Diff: scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_s5_perf_cq.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/android_bisect.expected/basic_perf_tryjob_with_revisions_android_s5_perf_bisect.json ('k') | scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_webview_arm64_aosp_perf_bisect.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_s5_perf_cq.json

diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_s5_perf_cq.json b/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_s5_perf_cq.json

index a5b4d84270f57bfabe0130f50e8caf5bdf15e9f2..e832145a1ab2178aa10fa6b015f0610cb8f46710 100644

--- a/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_s5_perf_cq.json

+++ b/scripts/slave/recipes/bisection/android_bisect.expected/basic_perf_tryjob_with_revisions_android_s5_perf_cq.json

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

"--git-cache-dir",

"[GIT_CACHE]",

"--issue",

- "12853011",

+ "12345",

"--patchset",

- "1",

+ "20001",

"--rietveld_server",

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

"--output_json",

@@ -379,6 +379,7 @@

"~followup_annotations": [

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

"@@@STEP_LOG_LINE@json.output@ \"bad_revision\": \"306476\", @@@",

+ "@@@STEP_LOG_LINE@json.output@ \"client_operation_id\": \"12345726327327\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"command\": \"./tools/perf/run_benchmark -v --browser=android-chrome sunspider\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"good_revision\": \"306475\", @@@",

"@@@STEP_LOG_LINE@json.output@ \"max_time_minutes\": \"25\", @@@",

@@ -532,6 +533,23 @@

"cmd": [

"python",

"-u",

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

+ "--",

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

+ "----",

+ "ls",

+ "gs://chrome-perf/android_perf_rel/full-build-linux_bad49c331def2a3bbf3ddd0096eb51551155.zip"

+ ],

+ "name": "gsutil exists",

+ "~followup_annotations": [

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

+ "@@@STEP_EXCEPTION@@@"

+ ]

+ },

+ {

+ "cmd": [

+ "python",

+ "-u",

"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",

"[SLAVE_BUILD]/src/out/Release/debug_info_dumps",

"[SLAVE_BUILD]/src/out/Release/test_logs",

@@ -557,66 +575,107 @@

{

"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\\\": \\\"android_perf_bisect_builder\\\", \\\"properties\\\": {\\\"build_archive_url\\\": \\\"gs://chrome-perf/android_perf_rel/full-build-linux_bad49c331def2a3bbf3ddd0096eb51551155.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",

- "android_s5_perf_cq",

- "--config-file",

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

- "--goma-dir",

- "[BUILD]/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@if os.path.exists(sys.argv[1]):@@@",

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

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

+ ]

{

"cmd": [

"python",

"-u",

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

- "--show-path",

- "python",

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

- "--gsutil-py-path",

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

+ "--",

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

- "--goma-dir",

- "[BUILD]/goma",

- "--goma-fail-fast",

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

- "--"

+ "--force-version",

+ "4.7",

+ "----",

+ "cp",

+ "gs://chrome-perf/android_perf_rel/full-build-linux_bad49c331def2a3bbf3ddd0096eb51551155.zip",

+ "[SLAVE_BUILD]/src/out/build_product.zip"

- "env": {

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

- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- },

- "name": "compile bad49c331def2a3bbf3ddd0096eb51551155",

- "~followup_annotations": [

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

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

- ]

+ "name": "gsutil download_build_product"

+ },

+ {

+ "cmd": [

+ "unzip",

+ "-o",

+ "[SLAVE_BUILD]/src/out/build_product.zip"

+ ],

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

+ "name": "unzip_build_product"

{

"cmd": [

@@ -656,9 +715,9 @@

"android",

"--xvfb",

"--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"android_s5_perf_cq\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"bisection/android_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\": \"android_s5_perf_cq\", \"buildnumber\": 571, \"is_test\": true, \"issue\": \"12345\", \"mastername\": \"tryserver.chromium.perf\", \"patch_project\": \"chromium\", \"patch_storage\": \"rietveld\", \"patchset\": \"20001\", \"project\": \"chrome\", \"recipe\": \"bisection/android_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=android_s5_perf_cq",

"--slave-name=TestSlavename",

@@ -803,26 +862,31 @@

"cmd": [

"python",

"-u",

- "\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",

- "[SLAVE_BUILD]/src/out/Release/debug_info_dumps",

- "[SLAVE_BUILD]/src/out/Release/test_logs",

- "[SLAVE_BUILD]/src/out/build_product.zip",

- "[SLAVE_BUILD]/src"

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

+ "--",

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

+ "----",

+ "ls",

+ "gs://chrome-perf/android_perf_rel/full-build-linux_d49c331def2a3bbf3ddd0096eb51551155.zip"

+ ],

+ "name": "gsutil exists (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"

- "name": "clean local files (3)",

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

"~followup_annotations": [

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

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

- "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[1], True)@@@",

- "@@@STEP_LOG_LINE@python.inline@shutil.rmtree(sys.argv[2], True)@@@",

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

- "@@@STEP_LOG_LINE@python.inline@ os.remove(sys.argv[3])@@@",

- "@@@STEP_LOG_LINE@python.inline@except OSError:@@@",

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

- "@@@STEP_LOG_LINE@python.inline@for base, _dirs, files in os.walk(sys.argv[4]):@@@",

- "@@@STEP_LOG_LINE@python.inline@ for f in files:@@@",

- "@@@STEP_LOG_LINE@python.inline@ if f.endswith('.pyc'):@@@",

- "@@@STEP_LOG_LINE@python.inline@ os.remove(os.path.join(base, f))@@@",

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

]

@@ -830,64 +894,26 @@

"cmd": [

"python",

"-u",

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

- "gen",

- "-m",

- "tryserver.chromium.perf",

- "-b",

- "android_s5_perf_cq",

- "--config-file",

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

- "--goma-dir",

- "[BUILD]/goma",

- "//out/Release"

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

+ "--",

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

+ "--force-version",

+ "4.7",

+ "----",

+ "cp",

+ "gs://chrome-perf/android_perf_rel/full-build-linux_d49c331def2a3bbf3ddd0096eb51551155.zip",

+ "[SLAVE_BUILD]/src/out/build_product.zip"

- "env": {

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

- },

- "name": "generate_build_files d49c331def2a3bbf3ddd0096eb51551155"

+ "name": "gsutil download_build_product (2)"

{

"cmd": [

- "python",

- "-u",

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

- "--show-path",

- "python",

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

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

- "--goma-dir",

- "[BUILD]/goma",

- "--goma-fail-fast",

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

- "--"

+ "unzip",

+ "-o",

+ "[SLAVE_BUILD]/src/out/build_product.zip"

- "env": {

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

- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"

- },

- "name": "compile d49c331def2a3bbf3ddd0096eb51551155",

- "~followup_annotations": [

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

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

- ]

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

+ "name": "unzip_build_product (2)"

{

"cmd": [

@@ -927,9 +953,9 @@

"android",

"--xvfb",

"--factory-properties",

"--build-properties",

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

"--builder-name=android_s5_perf_cq",

"--slave-name=TestSlavename",

@@ -1012,9 +1038,9 @@

"--git-cache-dir",

"[GIT_CACHE]",

"--issue",

- "12853011",

+ "12345",

"--patchset",

- "1",

+ "20001",

"--rietveld_server",

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

"--output_json",