| Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json
|
| index c7a302eaf3fbc22baedcaf7f818feb2b6a09eca9..809b20c97be4433f61b4c8263d1f679948b7ac78 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json
|
| @@ -117,220 +117,19 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| - "gen",
|
| - "-m",
|
| - "chromium.perf",
|
| - "-b",
|
| - "Android Builder",
|
| - "--config-file",
|
| - "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| - "--goma-dir",
|
| - "[BUILD]/goma",
|
| - "//out/Release"
|
| + "import sys; sys.exit(1)"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| - "name": "generate_build_files"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/compile.py",
|
| - "--target",
|
| - "Release",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| - "--build-tool",
|
| - "ninja",
|
| - "--compiler",
|
| - "goma",
|
| - "--goma-jsonstatus",
|
| - "/path/to/tmp/json",
|
| - "--mode",
|
| - "official",
|
| - "--goma-dir",
|
| - "[BUILD]/goma",
|
| - "--goma-hermetic",
|
| - "fallback",
|
| - "--"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "env": {
|
| - "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)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "allow_subannotations": true,
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/zip_build.py",
|
| - "--target",
|
| - "Release",
|
| - "--build-url",
|
| - "gs://chrome-perf/Android Builder",
|
| - "--build_revision",
|
| - "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Android Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.perf\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "package build"
|
| - },
|
| - {
|
| - "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "trigger",
|
| - "trigger_specs": [
|
| - {
|
| - "builder_name": "Android Galaxy S5 Perf (1)"
|
| - }
|
| - ],
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Android Galaxy S5 Perf (1)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "trigger (2)",
|
| - "trigger_specs": [
|
| - {
|
| - "builder_name": "Android Galaxy S5 Perf (2)"
|
| - }
|
| - ],
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Android Galaxy S5 Perf (2)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "trigger (3)",
|
| - "trigger_specs": [
|
| - {
|
| - "builder_name": "Android Galaxy S5 Perf (3)"
|
| - }
|
| - ],
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Android Galaxy S5 Perf (3)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "trigger (4)",
|
| - "trigger_specs": [
|
| - {
|
| - "builder_name": "Android Nexus5 Perf (1)"
|
| - }
|
| - ],
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Android Nexus5 Perf (1)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "trigger (5)",
|
| - "trigger_specs": [
|
| - {
|
| - "builder_name": "Android Nexus5 Perf (2)"
|
| - }
|
| - ],
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Android Nexus5 Perf (2)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "trigger (6)",
|
| - "trigger_specs": [
|
| - {
|
| - "builder_name": "Android Nexus6 Perf (1)"
|
| - }
|
| - ],
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Android Nexus6 Perf (1)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "trigger (7)",
|
| - "trigger_specs": [
|
| - {
|
| - "builder_name": "Android Nexus6 Perf (2)"
|
| - }
|
| - ],
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Android Nexus6 Perf (2)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "trigger (8)",
|
| - "trigger_specs": [
|
| - {
|
| - "builder_name": "Android Nexus7v2 Perf (1)"
|
| - }
|
| - ],
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Android Nexus7v2 Perf (1)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "trigger (9)",
|
| - "trigger_specs": [
|
| - {
|
| - "builder_name": "Android Nexus7v2 Perf (2)"
|
| - }
|
| - ],
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Android Nexus7v2 Perf (2)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "trigger (10)",
|
| - "trigger_specs": [
|
| - {
|
| - "builder_name": "Android One Perf (1)"
|
| - }
|
| - ],
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Android One Perf (1)@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [],
|
| - "cwd": "[SLAVE_BUILD]",
|
| - "name": "trigger (11)",
|
| - "trigger_specs": [
|
| - {
|
| - "builder_name": "Android One Perf (2)"
|
| - }
|
| - ],
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Android One Perf (2)@@@"
|
| + "step returned non-zero exit code: 1",
|
| + "@@@STEP_TEXT@Please add explicit compile targets for the build@@@",
|
| + "@@@STEP_FAILURE@@@"
|
| ]
|
| },
|
| {
|
| "name": "$result",
|
| - "recipe_result": null,
|
| - "status_code": 0
|
| + "reason": "Step('compile') failed with return_code 1",
|
| + "status_code": 1
|
| }
|
| ]
|
|
|