| Index: scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_nexus5_perf_bisect.json
|
| diff --git a/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_nexus5_perf_bisect.json b/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_nexus5_perf_bisect.json
|
| index 2d7f041f3015ed7492b1d921829c1063ea58eb67..a6b4a92c54c19b37dcd66e2cf4388c331eacdb36 100644
|
| --- a/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_nexus5_perf_bisect.json
|
| +++ b/scripts/slave/recipes/bisection/android_bisect.expected/basic_recipe_android_nexus5_perf_bisect.json
|
| @@ -3,6 +3,28 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect",
|
| + "511"
|
| + ],
|
| + "name": "makedirs checkout path",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| "tryserver.chromium.perf",
|
| @@ -30,6 +52,7 @@
|
| "src@1111111",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_nexus5_perf_bisect",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -114,10 +137,10 @@
|
| "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"
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release/debug_info_dumps",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release/test_logs",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/build_product.zip",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src"
|
| ],
|
| "name": "clean local files",
|
| "~followup_annotations": [
|
| @@ -143,7 +166,7 @@
|
| "--cached",
|
| "--name-only"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src",
|
| "name": "git diff to analyze patch",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -155,9 +178,9 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/symlink.py",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/symlink.py",
|
| "-f",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "~/adb"
|
| ],
|
| "name": "create adb symlink"
|
| @@ -166,13 +189,13 @@
|
| "cmd": [
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
|
| "--",
|
| - "[SLAVE_BUILD]/src/build/android/adb_logcat_monitor.py",
|
| - "[SLAVE_BUILD]/src/out/logcat",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android/adb_logcat_monitor.py",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/logcat",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "spawn_logcat_monitor"
|
| },
|
| @@ -183,28 +206,28 @@
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
|
| "--verbose",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb"
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "authorize_adb_devices"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/bad_devices.json",
|
| "--known-devices-file",
|
| "[HOME]/.android/known_devices.json",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "-v"
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "device_recovery"
|
| },
|
| @@ -212,11 +235,11 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/provision_devices.py",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android/provision_devices.py",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/bad_devices.json",
|
| "--output-device-blacklist",
|
| "/path/to/tmp/json",
|
| "-t",
|
| @@ -231,29 +254,29 @@
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "provision_devices"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_status.py",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/catapult/devil/devil/android/tools/device_status.py",
|
| "--json-output",
|
| "/path/to/tmp/json",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/bad_devices.json",
|
| "--known-devices-file",
|
| "[HOME]/.android/known_devices.json",
|
| "--buildbot-path",
|
| "/home/chrome-bot/.adb_device_info",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "-v",
|
| "--overwrite-known-devices-files"
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "device_status",
|
| "~followup_annotations": [
|
| @@ -362,10 +385,10 @@
|
| "/tmp/device_monitor.pid",
|
| "--",
|
| "RECIPE_MODULE[build::chromium_android]/resources/spawn_device_monitor.py",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "[\"07a00ca4\"]",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json"
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/bad_devices.json"
|
| ],
|
| "name": "spawn_device_monitor"
|
| },
|
| @@ -376,13 +399,13 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| "GYP_CROSSCOMPILE": "1",
|
| - "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[BUILD]/goma' target_arch=arm use_goma=1",
|
| - "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='RECIPE_PACKAGE_REPO[build]/goma' target_arch=arm use_goma=1",
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| },
|
| @@ -422,7 +445,7 @@
|
| "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"
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release"
|
| ],
|
| "name": "rmtree build directory",
|
| "~followup_annotations": [
|
| @@ -448,7 +471,7 @@
|
| "----",
|
| "cp",
|
| "gs://chrome-perf/test-archive.zip",
|
| - "[SLAVE_BUILD]/src/out/build_product.zip"
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/build_product.zip"
|
| ],
|
| "name": "gsutil download_build_product"
|
| },
|
| @@ -456,9 +479,9 @@
|
| "cmd": [
|
| "unzip",
|
| "-o",
|
| - "[SLAVE_BUILD]/src/out/build_product.zip"
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/build_product.zip"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src",
|
| "name": "unzip_build_product"
|
| },
|
| {
|
| @@ -466,29 +489,29 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/chrome/VERSION",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/chrome/VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "get version"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/adb_install_apk.py",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android/adb_install_apk.py",
|
| "ChromePublic.apk",
|
| "-v",
|
| "--blacklist-file",
|
| - "[SLAVE_BUILD]/src/out/bad_devices.json",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/bad_devices.json",
|
| "--adb-path",
|
| - "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools/adb",
|
| "--release"
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "install ChromePublic.apk"
|
| },
|
| @@ -503,9 +526,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_nexus5_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, \"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\"}",
|
| + "{\"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_nexus5_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\", \"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_nexus5_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, \"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\"}",
|
| + "{\"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_nexus5_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\", \"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_nexus5_perf_bisect",
|
| "--slave-name=TestSlavename",
|
| @@ -518,7 +541,7 @@
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "Performance Test 1 of 2",
|
| "stderr": "/path/to/tmp/",
|
| @@ -538,9 +561,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_nexus5_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, \"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\"}",
|
| + "{\"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_nexus5_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\", \"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_nexus5_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, \"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\"}",
|
| + "{\"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_nexus5_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\", \"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_nexus5_perf_bisect",
|
| "--slave-name=TestSlavename",
|
| @@ -553,7 +576,7 @@
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "Performance Test 2 of 2",
|
| "stderr": "/path/to/tmp/",
|
| @@ -570,7 +593,7 @@
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "saving json to temp file",
|
| "stdin": "{\"output\": [], \"results\": {\"values\": [0, 0]}, \"retcodes\": [0, 0]}",
|
| @@ -590,7 +613,7 @@
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "gsutil upload",
|
| "~followup_annotations": [
|
| @@ -602,11 +625,11 @@
|
| "python",
|
| "-u",
|
| "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
|
| - "[SLAVE_BUILD]/src/out/Release/test_logs/*.log"
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release/test_logs/*.log"
|
| ],
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "test_report",
|
| "~followup_annotations": [
|
| @@ -624,6 +647,28 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect",
|
| + "511"
|
| + ],
|
| + "name": "makedirs checkout path (2)",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| "tryserver.chromium.perf",
|
| @@ -651,6 +696,7 @@
|
| "src@1111111",
|
| "--output_manifest"
|
| ],
|
| + "cwd": "[BUILDER_CACHE]/android_nexus5_perf_bisect",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -746,10 +792,10 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android/adb_logcat_printer.py",
|
| "--output-path",
|
| - "[SLAVE_BUILD]/src/out/Release/full_log",
|
| - "[SLAVE_BUILD]/src/out/logcat"
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release/full_log",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/logcat"
|
| ],
|
| "name": "logcat_dump"
|
| },
|
| @@ -768,7 +814,7 @@
|
| "cp",
|
| "-a",
|
| "public-read",
|
| - "[SLAVE_BUILD]/src/out/Release/full_log",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release/full_log",
|
| "gs://chromium-android/logcat_dumps/android_nexus5_perf_bisect/571"
|
| ],
|
| "name": "gsutil upload (2)",
|
| @@ -778,16 +824,16 @@
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_platform/development/scripts/stack",
|
| "--arch",
|
| "arm",
|
| "--more-info",
|
| - "[SLAVE_BUILD]/src/out/Release/full_log"
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release/full_log"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release",
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_with_logcat_dump"
|
| },
|
| @@ -796,22 +842,22 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/chrome/VERSION",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/chrome/VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| "name": "get version (2)"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/src/build/android/tombstones.py",
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android/tombstones.py",
|
| "-a",
|
| "-s",
|
| "-w"
|
| ],
|
| "env": {
|
| - "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
|
| + "CHROMIUM_OUTPUT_DIR": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release",
|
| "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"
|
| + "PATH": "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/android_nexus5_perf_bisect/src/build/android:%(PATH)s"
|
| },
|
| "name": "stack_tool_for_tombstones"
|
| },
|
| @@ -820,7 +866,7 @@
|
| "python",
|
| "-u",
|
| "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n with open(report, 'r') as f:\n for l in f.readlines():\n print l\n os.remove(report)\n",
|
| - "[SLAVE_BUILD]/src/out/Release/test_logs/*.log"
|
| + "[BUILDER_CACHE]/android_nexus5_perf_bisect/src/out/Release/test_logs/*.log"
|
| ],
|
| "name": "test_report (2)",
|
| "~followup_annotations": [
|
|
|