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

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json

Issue 1372133003: Revert of chromium_tests: raise infra failure when no compile targets are specified (patchset #1 id: (Closed) Base URL: http://src.chromium.org/chrome/trunk/tools/build/
Patch Set: Created 5 years, 3 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
Index: scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json
===================================================================
--- scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json (revision 296915)
+++ scripts/slave/recipes/chromium.expected/full_chromium_perf_Android_Builder.json (working copy)
@@ -105,19 +105,138 @@
"cmd": [
"python",
"-u",
- "import sys; sys.exit(1)"
+ "[BUILD]/scripts/slave/compile.py",
+ "--target",
+ "Release",
+ "--src-dir",
+ "[SLAVE_BUILD]/src",
+ "--build-tool",
+ "ninja",
+ "--compiler",
+ "goma",
+ "--mode",
+ "official",
+ "--goma-dir",
+ "[BUILD]/goma",
+ "--goma-hermetic",
+ "fallback",
+ "--"
],
"cwd": "[SLAVE_BUILD]",
- "name": "compile",
+ "env": {
+ "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ },
+ "name": "compile"
+ },
+ {
+ "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 Nexus5 Perf (1)"
+ }
+ ],
"~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_TEXT@Misconfigured bot: no compile targets@@@",
- "@@@STEP_FAILURE@@@"
+ "@@@STEP_TEXT@Android Nexus5 Perf (1)@@@"
]
},
{
- "name": "$final_result",
- "reason": "Step('compile') failed with return_code 1",
- "status_code": 1
+ "cmd": [],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "trigger (2)",
+ "trigger_specs": [
+ {
+ "builder_name": "Android Nexus5 Perf (2)"
+ }
+ ],
+ "~followup_annotations": [
+ "@@@STEP_TEXT@Android Nexus5 Perf (2)@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "trigger (3)",
+ "trigger_specs": [
+ {
+ "builder_name": "Android Nexus6 Perf (1)"
+ }
+ ],
+ "~followup_annotations": [
+ "@@@STEP_TEXT@Android Nexus6 Perf (1)@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "trigger (4)",
+ "trigger_specs": [
+ {
+ "builder_name": "Android Nexus6 Perf (2)"
+ }
+ ],
+ "~followup_annotations": [
+ "@@@STEP_TEXT@Android Nexus6 Perf (2)@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "trigger (5)",
+ "trigger_specs": [
+ {
+ "builder_name": "Android Nexus7v2 Perf"
+ }
+ ],
+ "~followup_annotations": [
+ "@@@STEP_TEXT@Android Nexus7v2 Perf@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "trigger (6)",
+ "trigger_specs": [
+ {
+ "builder_name": "Android One Perf (1)"
+ }
+ ],
+ "~followup_annotations": [
+ "@@@STEP_TEXT@Android One Perf (1)@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "cwd": "[SLAVE_BUILD]",
+ "name": "trigger (7)",
+ "trigger_specs": [
+ {
+ "builder_name": "Android One Perf (2)"
+ }
+ ],
+ "~followup_annotations": [
+ "@@@STEP_TEXT@Android One Perf (2)@@@"
+ ]
}
]

Powered by Google App Engine
This is Rietveld 408576698