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

Unified Diff: scripts/slave/recipes/bisection/android_bisect_staging.expected/basic_recipe_android_webview_arm64_aosp_perf_bisect.json

Issue 2247373002: Refactor stages 1, 2 and test_api overhaul. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Relative intra-module imports. Created 4 years, 2 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
Index: scripts/slave/recipes/bisection/android_bisect_staging.expected/basic_recipe_android_webview_arm64_aosp_perf_bisect.json
diff --git a/scripts/slave/recipes/bisection/android_bisect_staging.expected/basic_recipe_android_webview_arm64_aosp_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect_staging.expected/basic_recipe_android_webview_arm64_aosp_perf_bisect.json
index d5f3f5202b4605ca7df33eacacf5a5d4549c741d..c63f29f1e2bb871aa01e6c3eccb8ad4c52754c09 100644
--- a/scripts/slave/recipes/bisection/android_bisect_staging.expected/basic_recipe_android_webview_arm64_aosp_perf_bisect.json
+++ b/scripts/slave/recipes/bisection/android_bisect_staging.expected/basic_recipe_android_webview_arm64_aosp_perf_bisect.json
@@ -478,35 +478,6 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[build::bisect_tester_staging]/resources/put_temp.py"
- ],
- "cwd": "[BUILDER_CACHE]/android_webview_arm64_aosp_perf_bisect",
- "name": "saving url to temp file",
- "stdin": "http://build.chromium.org/p/tryserver.chromium.perf/json/builders/android_webview_arm64_aosp_perf_bisect/builds/571",
- "stdout": "/path/to/tmp/"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
- "--",
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "/tmp/dummy1",
- "gs://chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec"
- ],
- "cwd": "[BUILDER_CACHE]/android_webview_arm64_aosp_perf_bisect",
- "name": "gsutil bisect-results/f7a7b4135624439cbd27fdd5133d74ec",
- "~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec@@@"
- ]
- },
- {
- "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]/android_webview_arm64_aosp_perf_bisect/src/out/Release"
],
@@ -622,9 +593,9 @@
"android",
"--xvfb",
"--factory-properties",
- "{\"bisect_config\": {\"bug_id\": \"425582\", \"builder_host\": \"master4.golo.chromium.org\", \"builder_port\": \"8341\", \"command\": \"./tools/perf/run_benchmark -v --browser=android-chromium 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\": \"android_webview_arm64_aosp_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/android_bisect_staging\", \"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=android-chromium --output-format=valueset page_cycler_v2.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\": \"android_webview_arm64_aosp_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/android_bisect_staging\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--build-properties",
- "{\"bisect_config\": {\"bug_id\": \"425582\", \"builder_host\": \"master4.golo.chromium.org\", \"builder_port\": \"8341\", \"command\": \"./tools/perf/run_benchmark -v --browser=android-chromium 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\": \"android_webview_arm64_aosp_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/android_bisect_staging\", \"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=android-chromium --output-format=valueset page_cycler_v2.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\": \"android_webview_arm64_aosp_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/android_bisect_staging\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--step-name=Performance Test 1 of 2",
"--builder-name=android_webview_arm64_aosp_perf_bisect",
"--slave-name=TestSlavename",
@@ -633,7 +604,9 @@
"./tools/perf/run_benchmark",
"-v",
"--browser=android-chromium",
- "page_cycler.intl_ar_fa_he"
+ "--output-format=valueset",
+ "page_cycler_v2.intl_ar_fa_he",
+ "--output-dir=[TMP_BASE]/perf-test-output_tmp_1"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -650,6 +623,26 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[TMP_BASE]/perf-test-output_tmp_1/results-valueset.json",
+ "/path/to/tmp/json"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+ "PATH": "[BUILDER_CACHE]/android_webview_arm64_aosp_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_webview_arm64_aosp_perf_bisect/src/build/android:%(PATH)s"
+ },
+ "name": "Reading valueset results",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy\": \"dict\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
"--target",
"Release",
@@ -657,9 +650,9 @@
"android",
"--xvfb",
"--factory-properties",
- "{\"bisect_config\": {\"bug_id\": \"425582\", \"builder_host\": \"master4.golo.chromium.org\", \"builder_port\": \"8341\", \"command\": \"./tools/perf/run_benchmark -v --browser=android-chromium 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\": \"android_webview_arm64_aosp_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/android_bisect_staging\", \"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=android-chromium --output-format=valueset page_cycler_v2.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\": \"android_webview_arm64_aosp_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/android_bisect_staging\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--build-properties",
- "{\"bisect_config\": {\"bug_id\": \"425582\", \"builder_host\": \"master4.golo.chromium.org\", \"builder_port\": \"8341\", \"command\": \"./tools/perf/run_benchmark -v --browser=android-chromium 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\": \"android_webview_arm64_aosp_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/android_bisect_staging\", \"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=android-chromium --output-format=valueset page_cycler_v2.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\": \"android_webview_arm64_aosp_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/android_bisect_staging\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--step-name=Performance Test 2 of 2",
"--builder-name=android_webview_arm64_aosp_perf_bisect",
"--slave-name=TestSlavename",
@@ -668,7 +661,9 @@
"./tools/perf/run_benchmark",
"-v",
"--browser=android-chromium",
- "page_cycler.intl_ar_fa_he"
+ "--output-format=valueset",
+ "page_cycler_v2.intl_ar_fa_he",
+ "--output-dir=[TMP_BASE]/perf-test-output_tmp_2"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
@@ -685,35 +680,20 @@
"cmd": [
"python",
"-u",
- "RECIPE_MODULE[build::bisect_tester_staging]/resources/put_temp.py"
- ],
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "PATH": "[BUILDER_CACHE]/android_webview_arm64_aosp_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_webview_arm64_aosp_perf_bisect/src/build/android:%(PATH)s"
- },
- "name": "saving json to temp file",
- "stdin": "{\"output\": [], \"results\": {\"values\": [0, 0]}, \"retcodes\": [0, 0]}",
- "stdout": "/path/to/tmp/"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
- "--",
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "/tmp/dummy2",
- "gs://chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec.results"
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[TMP_BASE]/perf-test-output_tmp_2/results-valueset.json",
+ "/path/to/tmp/json"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
"PATH": "[BUILDER_CACHE]/android_webview_arm64_aosp_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_webview_arm64_aosp_perf_bisect/src/build/android:%(PATH)s"
},
- "name": "gsutil upload",
+ "name": "Reading valueset results (2)",
"~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chrome-perf/bisect-results/f7a7b4135624439cbd27fdd5133d74ec.results@@@"
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"dummy\": \"dict\"@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
]
},
{
@@ -888,7 +868,7 @@
"gs://chromium-android/logcat_dumps/android_webview_arm64_aosp_perf_bisect/571"
],
"cwd": "[BUILDER_CACHE]/android_webview_arm64_aosp_perf_bisect",
- "name": "gsutil upload (2)",
+ "name": "gsutil upload",
"~followup_annotations": [
"@@@STEP_LINK@logcat dump@https://storage.cloud.google.com/chromium-android/logcat_dumps/android_webview_arm64_aosp_perf_bisect/571@@@"
]

Powered by Google App Engine
This is Rietveld 408576698