| Index: scripts/slave/recipes/android/perf.expected/host_info_failure.json
|
| diff --git a/scripts/slave/recipes/android/perf.expected/src_side_script_fails.json b/scripts/slave/recipes/android/perf.expected/host_info_failure.json
|
| similarity index 97%
|
| copy from scripts/slave/recipes/android/perf.expected/src_side_script_fails.json
|
| copy to scripts/slave/recipes/android/perf.expected/host_info_failure.json
|
| index 83bd3e98d1dbde2e202808f532b8141ed3cb7066..69a9d5d47c0056b5704b411670a1893d5fae61f2 100644
|
| --- a/scripts/slave/recipes/android/perf.expected/src_side_script_fails.json
|
| +++ b/scripts/slave/recipes/android/perf.expected/host_info_failure.json
|
| @@ -114,16 +114,7 @@
|
| "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_LINE@json.output@ \"Android Nexus5 Perf (1)\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"scripts\": [@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"name\": \"host_info\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"script\": \"host_info.py\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| @@ -446,8 +437,6 @@
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| "[SLAVE_BUILD]/src/testing/scripts/host_info.py",
|
| "--build-config-fs",
|
| "Release",
|
| @@ -459,15 +448,16 @@
|
| "--output",
|
| "/path/to/tmp/json"
|
| ],
|
| - "name": "host_info",
|
| + "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": "Host_Info",
|
| "~followup_annotations": [
|
| - "step returned non-zero exit code: 1",
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"failures\": [], @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"valid\": true@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@STEP_FAILURE@@@"
|
| + "step returned non-zero exit code: 87",
|
| + "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
|
| + "@@@STEP_LOG_END@json.output (invalid)@@@",
|
| + "@@@STEP_EXCEPTION@@@"
|
| ]
|
| },
|
| {
|
| @@ -785,8 +775,7 @@
|
| },
|
| {
|
| "name": "$result",
|
| - "reason": "src-side perf tests failed [StepFailure(\"1 tests failed: ['host_info']\",)]",
|
| "recipe_result": null,
|
| - "status_code": 1
|
| + "status_code": 0
|
| }
|
| ]
|
|
|