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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_mac_retina_perf_bisect.json

Issue 2270563005: Clean up some discrepancies in the perf recipe configs (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Rebase. Created 4 years, 3 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/chromium.expected/full_tryserver_chromium_perf_mac_perf_bisect_builder.json ('k') | scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_mac_retina_perf_cq.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_mac_retina_perf_bisect.json
diff --git a/scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_mac_retina_perf_bisect.json b/scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_mac_retina_perf_bisect.json
index b70e3a30d2332c528889699a58ae130a2ed9a413..456b061f17e1cf750af7ea0fdfe5d2c3f3cbfe36 100644
--- a/scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_mac_retina_perf_bisect.json
+++ b/scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_mac_retina_perf_bisect.json
@@ -43,7 +43,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src@HEAD",
+ "src@1111111",
"--force",
"--output_manifest",
"--gerrit_no_rebase_patch_ref"
@@ -58,7 +58,7 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"1111111\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
@@ -206,54 +206,35 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILDER_CACHE]/mac_retina_perf_bisect/src/tools/mb/mb.py",
- "gen",
- "-m",
- "tryserver.chromium.perf",
- "-b",
- "mac_retina_perf_bisect",
- "--config-file",
- "[BUILDER_CACHE]/mac_retina_perf_bisect/src/tools/mb/mb_config.pyl",
- "--goma-dir",
- "[CACHE]/cipd/goma",
- "//out/Release"
+ "[BUILDER_CACHE]/mac_retina_perf_bisect/src/testing/scripts/get_compile_targets.py",
+ "--output",
+ "/path/to/tmp/json",
+ "--",
+ "--build-config-fs",
+ "Release",
+ "--paths",
+ "{\"checkout\": \"[BUILDER_CACHE]/mac_retina_perf_bisect/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+ "--properties",
+ "{\"buildername\": \"mac_retina_perf_bisect\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.perf\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}"
],
- "cwd": "[BUILDER_CACHE]/mac_retina_perf_bisect/src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "generate_build_files"
+ "name": "get compile targets for scripts",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
},
{
- "allow_subannotations": true,
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
- "--src-dir",
- "[BUILDER_CACHE]/mac_retina_perf_bisect/src",
- "--output-json",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[BUILDER_CACHE]/mac_retina_perf_bisect/src/testing/buildbot/tryserver.chromium.perf.json",
"/path/to/tmp/json"
],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "clang_revision",
+ "name": "read test spec (tryserver.chromium.perf.json)",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/mac_retina_perf_bisect/src/testing/buildbot/tryserver.chromium.perf.json@@@",
+ "@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
@@ -264,70 +245,51 @@
"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",
- "[BUILDER_CACHE]/mac_retina_perf_bisect/src",
- "--goma-cache-dir",
- "[GOMA_CACHE]",
- "--goma-deps-cache-dir",
- "[GOMA_DEPS_CACHE]",
- "--build-data-dir",
- "[ROOT]/build_data_dir",
- "--compiler",
- "goma-clang",
- "--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",
- "--",
- "chromium_builder_perf"
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
- },
- "name": "compile",
+ "name": "cleanup_temp"
+ },
+ {
+ "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",
+ "[BUILDER_CACHE]/mac_retina_perf_bisect/src/out/Release"
+ ],
+ "name": "rmtree build directory",
"~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
- "@@@STEP_LOG_END@json.output (invalid)@@@"
+ "@@@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@@@"
]
},
{
- "allow_subannotations": true,
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
"--show-path",
"python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/zip_build.py",
- "--target",
- "Release",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/extract_build.py",
"--gsutil-py-path",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
- "--staging-dir",
- "[CACHE]/chrome_staging",
+ "--target",
+ "Release",
"--src-dir",
"[BUILDER_CACHE]/mac_retina_perf_bisect/src",
- "--build_revision",
- "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"mac_retina_perf_bisect\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.perf\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"mac_retina_perf_bisect\", \"buildnumber\": 571, \"mastername\": \"tryserver.chromium.perf\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
+ "--build-archive-url",
+ "gs://test-domain/test-archive.zip",
+ "--master-name",
+ "tryserver.chromium.perf",
+ "--build-number",
+ "571"
],
- "name": "package build"
+ "name": "extract build"
},
{
"name": "$result",
« no previous file with comments | « scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_mac_perf_bisect_builder.json ('k') | scripts/slave/recipes/chromium.expected/full_tryserver_chromium_perf_mac_retina_perf_cq.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698