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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_recovery.json

Issue 2143013002: Revert "[Android] Reland splitting of device recovery and device status." (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 5 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/recipe_modules/chromium_android/example.expected/tester_other_device_failure.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_status.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_recovery.json
diff --git a/scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_recovery.json b/scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_recovery.json
deleted file mode 100644
index 597e8b434faa5b97a74548213799e0d30fd5d15a..0000000000000000000000000000000000000000
--- a/scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_recovery.json
+++ /dev/null
@@ -1,435 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "\nimport os, sys\n\nbuild_path = sys.argv[1]\nif os.path.exists(build_path):\n for (path, dir, files) in os.walk(build_path):\n for cur_file in files:\n if cur_file.endswith('index.lock'):\n path_to_file = os.path.join(path, cur_file)\n print 'deleting %s' % path_to_file\n os.remove(path_to_file)\n",
- "[SLAVE_BUILD]"
- ],
- "name": "cleanup index.lock",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@build_path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@if os.path.exists(build_path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ for (path, dir, files) in os.walk(build_path):@@@",
- "@@@STEP_LOG_LINE@python.inline@ for cur_file in files:@@@",
- "@@@STEP_LOG_LINE@python.inline@ if cur_file.endswith('index.lock'):@@@",
- "@@@STEP_LOG_LINE@python.inline@ path_to_file = os.path.join(path, cur_file)@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'deleting %s' % path_to_file@@@",
- "@@@STEP_LOG_LINE@python.inline@ os.remove(path_to_file)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
- "config",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src/repo', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]\ntarget_os = ['android']"
- ],
- "env": {
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient setup"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[BUILD]/scripts/slave/gclient_safe_revert.py",
- ".",
- "[DEPOT_TOOLS]/gclient"
- ],
- "name": "gclient revert"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
- "sync",
- "--nohooks",
- "--force",
- "--verbose",
- "--delete_unversioned_trees",
- "--revision",
- "src/repo@4f4b02f6b7fa20a3a25682c457bbc8ad589c8a00",
- "--output-json",
- "/path/to/tmp/json"
- ],
- "env": {
- "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "gclient sync",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 170242@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/buildtools/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 182578@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/native_client/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 274981@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/repo/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 126336@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 297276@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 120644@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 276089@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"src/v8/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 43426@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",
- "@@@SET_BUILD_PROPERTY@got_src_revision@170242@@@",
- "@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",
- "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
- "@@@SET_BUILD_PROPERTY@got_angle_revision@297276@@@",
- "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@",
- "@@@SET_BUILD_PROPERTY@got_buildtools_revision@182578@@@"
- ]
- },
- {
- "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"
- ],
- "name": "clean local files",
- "~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_END@python.inline@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
- "runhooks"
- ],
- "cwd": "[SLAVE_BUILD]/src",
- "env": {
- "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 target_arch=arm",
- "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"
- },
- {
- "allow_subannotations": false,
- "cmd": [
- "[SLAVE_BUILD]/src/build/tree_truth.sh",
- "[SLAVE_BUILD]/src",
- "src",
- "foo",
- "src/repo"
- ],
- "name": "tree truth steps"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/chrome/VERSION",
- "/path/to/tmp/"
- ],
- "name": "get version"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
- "--",
- "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
- "--force-version",
- "4.7",
- "----",
- "cp",
- "gs://build-bucket/build_product.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": [
- "[DEPOT_TOOLS]/git_number.py"
- ],
- "cwd": "[SLAVE_BUILD]/src",
- "name": "git_number",
- "stdout": "/path/to/tmp/"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[build::adb]/resources/list_devices.py",
- "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
- "/path/to/tmp/json"
- ],
- "name": "List adb devices",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@[@@@",
- "@@@STEP_LOG_LINE@json.output@ \"014E1F310401C009\"@@@",
- "@@@STEP_LOG_LINE@json.output@]@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport subprocess\nimport sys\nadb_path = sys.argv[1]\nfor device in sys.argv[2:]:\n print 'Attempting to root device %s ...' % (device)\n subprocess.check_call([adb_path, '-s', device, 'root'])\n subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])\n print 'Finished rooting device %s' % (device)\n",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb",
- "014E1F310401C009"
- ],
- "name": "Root devices",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@python.inline@@@@",
- "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
- "@@@STEP_LOG_LINE@python.inline@import sys@@@",
- "@@@STEP_LOG_LINE@python.inline@adb_path = sys.argv[1]@@@",
- "@@@STEP_LOG_LINE@python.inline@for device in sys.argv[2:]:@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Attempting to root device %s ...' % (device)@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', device, 'root'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])@@@",
- "@@@STEP_LOG_LINE@python.inline@ print 'Finished rooting device %s' % (device)@@@",
- "@@@STEP_LOG_END@python.inline@@@"
- ]
- },
- {
- "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"
- ],
- "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": "spawn_logcat_monitor"
- },
- {
- "cmd": [
- "python",
- "-u",
- "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"
- ],
- "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": "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/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"
- },
- "name": "device_recovery",
- "~followup_annotations": [
- "step returned non-zero exit code: 2",
- "@@@STEP_EXCEPTION@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
- "monkey",
- "-v",
- "--package=chrome",
- "--event-count=50000",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--adb-path",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
- ],
- "env": {
- "BUILDTYPE": "Release",
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
- },
- "name": "Monkey Test"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[SLAVE_BUILD]/src/build/android/test_runner.py",
- "instrumentation",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--flakiness-dashboard-server",
- "test-results.appspot.com",
- "-A",
- "SmallTest",
- "-E",
- "FlakyTest",
- "--screenshot",
- "--test-apk",
- "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebViewTest.apk",
- "--apk-under-test",
- "[SLAVE_BUILD]/src/out/Release/apks/AndroidWebView.apk",
- "--additional-apk",
- "Additional.apk",
- "--isolate-file-path",
- "android_webview/android_webview_test_data.isolate",
- "--release",
- "--official-build",
- "--adb-path",
- "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
- ],
- "env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release"
- },
- "name": "SmallTest"
- },
- {
- "cmd": [
- "python",
- "-u",
- "[SLAVE_BUILD]/src/out/Release/bin/run_unittests",
- "--blacklist-file",
- "[SLAVE_BUILD]/src/out/bad_devices.json",
- "--verbose",
- "--isolate_file_path=[SLAVE_BUILD]/src/some_file.isolate",
- "--gtest_filter=WebRtc*",
- "--tool=asan",
- "--adb-path",
- "[SLAVE_BUILD]/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"
- },
- "name": "unittests"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/tee.py",
- "[SLAVE_BUILD]/src/out/Release/full_log",
- "--",
- "[SLAVE_BUILD]/src/build/android/adb_logcat_printer.py",
- "[SLAVE_BUILD]/src/out/logcat"
- ],
- "name": "logcat_dump"
- },
- {
- "cmd": [
- "[SLAVE_BUILD]/src/third_party/android_platform/development/scripts/stack",
- "--arch",
- "arm",
- "--more-info",
- "[SLAVE_BUILD]/src/out/Release/full_log"
- ],
- "env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/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"
- },
- "name": "stack_tool_with_logcat_dump"
- },
- {
- "cmd": [
- "python",
- "-u",
- "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/chrome/VERSION",
- "/path/to/tmp/"
- ],
- "name": "get version (2)"
- },
- {
- "cmd": [
- "[SLAVE_BUILD]/src/build/android/tombstones.py",
- "-a",
- "-s",
- "-w"
- ],
- "env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/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"
- },
- "name": "stack_tool_for_tombstones"
- },
- {
- "cmd": [
- "[SLAVE_BUILD]/src/build/android/asan_symbolize.py",
- "-l",
- "[SLAVE_BUILD]/src/out/Release/full_log"
- ],
- "env": {
- "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/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"
- },
- "name": "stack_tool_for_asan"
- },
- {
- "name": "$result",
- "reason": "Infra Failure: Step('device_recovery') returned 2",
- "recipe_result": null,
- "status_code": 2
- }
-]
« no previous file with comments | « scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure.json ('k') | scripts/slave/recipe_modules/chromium_android/example.expected/tester_other_device_failure_during_status.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698