| Index: scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_tester_arm32_debug__nexus_5x__forced_invalid.json
|
| diff --git a/scripts/slave/recipes/webrtc/auto_roll_webrtc_deps.expected/rolling_activated.json b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_tester_arm32_debug__nexus_5x__forced_invalid.json
|
| similarity index 67%
|
| copy from scripts/slave/recipes/webrtc/auto_roll_webrtc_deps.expected/rolling_activated.json
|
| copy to scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_tester_arm32_debug__nexus_5x__forced_invalid.json
|
| index c3038a695b023416b59af879f50256a21d76b3f1..318846745d12abfcd0d735ec717279dec8ded293 100644
|
| --- a/scripts/slave/recipes/webrtc/auto_roll_webrtc_deps.expected/rolling_activated.json
|
| +++ b/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_android_tester_arm32_debug__nexus_5x__forced_invalid.json
|
| @@ -3,16 +3,12 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILD]/scripts/tools/pycurl.py",
|
| - "https://webrtc-roll-cr-rev-status.appspot.com/status"
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| + "--show-path",
|
| + "python",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| ],
|
| - "name": "check roll status",
|
| - "stdout": "/path/to/tmp/",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Rolling activated@@@",
|
| - "@@@STEP_LOG_LINE@stdout@1@@@",
|
| - "@@@STEP_LOG_END@stdout@@@"
|
| - ]
|
| + "name": "cleanup_temp"
|
| },
|
| {
|
| "cmd": [
|
| @@ -20,7 +16,7 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/external/webrtc'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc-limited', 'url': 'https://chrome-internal.googlesource.com/chrome/deps/webrtc-limited'}]",
|
| + "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/libyuv/libyuv'}]\ntarget_os = ['android']",
|
| "--patch_root",
|
| "src",
|
| "--revision_mapping_file",
|
| @@ -73,43 +69,17 @@
|
| ],
|
| "cwd": "[SLAVE_BUILD]/src",
|
| "env": {
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| + "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 gomadir='[BUILD]/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"
|
| },
|
| {
|
| - "cmd": [
|
| - "git",
|
| - "checkout",
|
| - "-f",
|
| - "master"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| - "name": "git checkout"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "git",
|
| - "clean",
|
| - "-ffd"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| - "name": "git clean"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[SLAVE_BUILD]/src/tools/autoroller/roll_chromium_revision.py",
|
| - "--clean",
|
| - "--verbose"
|
| - ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| - "name": "autoroll chromium_revision"
|
| - },
|
| - {
|
| "name": "$result",
|
| + "reason": "Testers cannot be forced without providing revision information. Please select a previous build and click [Rebuild] or force a build for a Builder instead (will trigger new runs for the testers).",
|
| "recipe_result": null,
|
| - "status_code": 0
|
| + "status_code": 1
|
| }
|
| ]
|
|
|