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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/android/perf.expected/provision_devices.json

Issue 2445193002: Change all remote run builders to use tools/build. (Closed)
Patch Set: Add recipes 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
« no previous file with comments | « scripts/slave/recipes/android/perf.expected/missing_device.json ('k') | scripts/slave/recipes/android/perf.expected/src_side_script_fails.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/android/perf.expected/provision_devices.json
diff --git a/scripts/slave/recipes/android/builder.expected/full_tryserver_chromium_perf_android_perf_bisect_builder.json b/scripts/slave/recipes/android/perf.expected/provision_devices.json
similarity index 67%
copy from scripts/slave/recipes/android/builder.expected/full_tryserver_chromium_perf_android_perf_bisect_builder.json
copy to scripts/slave/recipes/android/perf.expected/provision_devices.json
index 08ed00248d7ff2464817685a46a55240021054fe..e8786768f3dafe65fa6923b3dd4f13ec65f0dddd 100644
--- a/scripts/slave/recipes/android/builder.expected/full_tryserver_chromium_perf_android_perf_bisect_builder.json
+++ b/scripts/slave/recipes/android/perf.expected/provision_devices.json
@@ -1,63 +1,5 @@
[
{
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]/resources/bootstrap.py",
- "--platform",
- "linux-amd64",
- "--dest-directory",
- "[SLAVE_BUILD]/cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "name": "ensure_goma.install cipd",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[SLAVE_BUILD]/cipd/cipd",
- "ensure",
- "--root",
- "[CACHE]/cipd/goma",
- "--list",
- "infra/tools/cloudtail/linux-amd64 goma_recipe_module\ninfra_internal/goma/client/linux-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "/creds/service_accounts/service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/linux-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [
"python",
"-u",
@@ -70,14 +12,10 @@
"{\"src\": \"got_revision\", \"src/buildtools\": \"got_buildtools_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
"--git-cache-dir",
"[GIT_CACHE]",
- "--issue",
- "8675309",
- "--patchset",
- "1",
"--output_json",
"/path/to/tmp/json",
"--revision",
- "src@267739",
+ "src@deadbeef",
"--output_manifest"
],
"env": {
@@ -89,7 +27,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\": \"267739\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"src\": \"deadbeef\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
@@ -163,6 +101,42 @@
"cmd": [
"python",
"-u",
+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+ "[SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json",
+ "/path/to/tmp/json"
+ ],
+ "name": "read test spec (chromium.perf.json)",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.perf.json@@@",
+ "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
+ "--output",
+ "/path/to/tmp/json",
+ "--",
+ "--build-config-fs",
+ "Release",
+ "--paths",
+ "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
+ "--properties",
+ "{\"buildername\": \"Android Nexus5 Perf (1)\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"perf-id\": \"android-nexus5\", \"results-url\": \"https://chromeperf.appspot.com\", \"slavename\": \"slavename\", \"target_platform\": \"android\"}"
+ ],
+ "name": "get compile targets for scripts",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output@{}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "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",
@@ -190,116 +164,155 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
- "runhooks"
+ "\nimport sys\nsys.path.append(sys.argv[1])\nfrom devil import devil_env\ndevil_env.config.Initialize()\ndevil_env.config.PrefetchPaths(dependencies=['adb'])\n",
+ "[SLAVE_BUILD]/src/third_party/catapult/devil"
],
- "cwd": "[SLAVE_BUILD]/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='[CACHE]/cipd/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]"
- },
- "name": "gclient runhooks"
+ "name": "initialize devil",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@python.inline@@@@",
+ "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+ "@@@STEP_LOG_LINE@python.inline@sys.path.append(sys.argv[1])@@@",
+ "@@@STEP_LOG_LINE@python.inline@from devil import devil_env@@@",
+ "@@@STEP_LOG_LINE@python.inline@devil_env.config.Initialize()@@@",
+ "@@@STEP_LOG_LINE@python.inline@devil_env.config.PrefetchPaths(dependencies=['adb'])@@@",
+ "@@@STEP_LOG_END@python.inline@@@"
+ ]
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/tools/mb/mb.py",
- "gen",
- "-m",
- "tryserver.chromium.perf",
- "-b",
- "android_perf_bisect_builder",
- "--config-file",
- "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
- "--goma-dir",
- "[CACHE]/cipd/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 Builder/full-build-linux_deadbeef.zip",
+ "[SLAVE_BUILD]/src/out/build_product.zip"
+ ],
+ "name": "gsutil download_build_product"
+ },
+ {
+ "cmd": [
+ "unzip",
+ "-o",
+ "[SLAVE_BUILD]/src/out/build_product.zip"
],
"cwd": "[SLAVE_BUILD]/src",
+ "name": "unzip_build_product"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "[SLAVE_BUILD]/src/build/symlink.py",
+ "-f",
+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
+ "~/adb"
+ ],
+ "name": "create adb symlink"
+ },
+ {
+ "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/catapult/devil/bin/deps/linux2/x86_64/bin/adb"
+ ],
"env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ "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": "generate_build_files"
+ "name": "spawn_logcat_monitor"
},
{
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/daemonizer.py",
+ "--action",
+ "restart",
+ "--pid-file-path",
+ "/tmp/device_monitor.pid",
+ "--",
+ "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_monitor.py",
+ "--adb-path",
+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json"
+ ],
+ "name": "spawn_device_monitor"
+ },
+ {
+ "cmd": [
"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]",
- "--buildbot-buildername",
- "android_perf_bisect_builder",
- "--buildbot-mastername",
- "tryserver.chromium.perf",
- "--buildbot-slavename",
- "TestSlavename",
- "--goma-deps-cache-file",
- "android_perf_bisect_builder.gomadeps",
- "--compiler",
- "goma",
- "--goma-jsonstatus",
- "/path/to/tmp/json",
- "--goma-service-account-json-file",
- "/creds/service_accounts/service-account-goma-client.json",
- "--goma-dir",
- "[CACHE]/cipd/goma",
- "--"
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/android/authorize_adb_devices.py",
+ "--verbose",
+ "--adb-path",
+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/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"
},
- "name": "compile",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
- "@@@STEP_LOG_END@json.output (invalid)@@@"
- ]
+ "name": "authorize_adb_devices"
+ },
+ {
+ "cmd": [
+ "[SLAVE_BUILD]/src/third_party/catapult/devil/devil/android/tools/device_recovery.py",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--known-devices-file",
+ "[HOME]/.android/known_devices.json",
+ "--adb-path",
+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
+ "-v",
+ "--enable-usb-reset"
+ ],
+ "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": "device_recovery"
},
{
- "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",
+ "[SLAVE_BUILD]/src/build/android/provision_devices.py",
+ "--adb-path",
+ "[SLAVE_BUILD]/src/third_party/catapult/devil/bin/deps/linux2/x86_64/bin/adb",
+ "--blacklist-file",
+ "[SLAVE_BUILD]/src/out/bad_devices.json",
+ "--output-device-blacklist",
+ "/path/to/tmp/json",
+ "-t",
"Release",
- "--gsutil-py-path",
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
- "--staging-dir",
- "[CACHE]/chrome_staging",
- "--src-dir",
- "[SLAVE_BUILD]/src",
- "--exclude-files",
- "lib.target,gen,android_webview,jingle_unittests",
- "--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"android_perf_bisect_builder\", \"buildnumber\": 257, \"got_revision\": \"267739\", \"issue\": \"8675309\", \"mastername\": \"tryserver.chromium.perf\", \"patchset\": \"1\", \"recipe\": \"android/builder\", \"repository\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"267739\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
- "--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"android_perf_bisect_builder\", \"buildnumber\": 257, \"got_revision\": \"267739\", \"issue\": \"8675309\", \"mastername\": \"tryserver.chromium.perf\", \"patchset\": \"1\", \"recipe\": \"android/builder\", \"repository\": \"svn://svn.chromium.org/chrome/trunk/src\", \"revision\": \"267739\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
+ "--min-battery-level",
+ "95",
+ "--disable-network",
+ "--disable-java-debug",
+ "--max-battery-temp",
+ "350"
],
- "name": "zip_build"
+ "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": "provision_devices",
+ "~followup_annotations": [
+ "step returned non-zero exit code: 1",
+ "@@@STEP_EXCEPTION@@@"
+ ]
},
{
"name": "$result",
+ "reason": "Infra Failure: Step('provision_devices') returned 1",
"recipe_result": null,
- "status_code": 0
+ "status_code": 1
}
]
« no previous file with comments | « scripts/slave/recipes/android/perf.expected/missing_device.json ('k') | scripts/slave/recipes/android/perf.expected/src_side_script_fails.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698