| Index: scripts/slave/recipes/webrtc/ios.expected/infrastructure_failure.json
|
| diff --git a/scripts/slave/recipes/ios/unified_builder_tester.expected/infrastructure_failure.json b/scripts/slave/recipes/webrtc/ios.expected/infrastructure_failure.json
|
| similarity index 52%
|
| copy from scripts/slave/recipes/ios/unified_builder_tester.expected/infrastructure_failure.json
|
| copy to scripts/slave/recipes/webrtc/ios.expected/infrastructure_failure.json
|
| index ad2570585301d5ab27ca1ecc59c85044ebce0f00..9532f274d4159afa03d510eb8ac10ac9f977e412 100644
|
| --- a/scripts/slave/recipes/ios/unified_builder_tester.expected/infrastructure_failure.json
|
| +++ b/scripts/slave/recipes/webrtc/ios.expected/infrastructure_failure.json
|
| @@ -34,85 +34,25 @@
|
| "--slave",
|
| "fake-vm",
|
| "--spec",
|
| - "cache_dir = None\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]\ntarget_os = ['ios']",
|
| + "cache_dir = None\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'}]\ntarget_os = ['ios', 'mac']",
|
| "--root",
|
| "src",
|
| "--revision_mapping_file",
|
| - "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| + "{\"src\": \"got_revision\"}",
|
| "--output_json",
|
| "/path/to/tmp/json",
|
| "--revision",
|
| "src@HEAD",
|
| - "--force",
|
| "--output_manifest"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "bot_update",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@Some step text@@@",
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/native_client\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/native_client.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/angle.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/third_party/webrtc.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/tools/swarming_client\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/tools/swarming_client.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"src/v8\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src/v8.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"did_run\": false, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_nacl_revision@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webrtc_revision@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_nacl_revision_cp@\"refs/heads/master@{#274981}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_angle_revision@\"fac9503c46405f77757b9a728eb85b8d7bc6080c\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision_cp@\"refs/heads/master@{#43426}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_cp@\"refs/heads/master@{#276089}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webrtc_revision_cp@\"refs/heads/master@{#120644}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_angle_revision_cp@\"refs/heads/master@{#297276}\"@@@"
|
| + "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| {
|
| @@ -120,7 +60,7 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/ios/build/bots/chromium.fake/ios.json",
|
| + "[SLAVE_BUILD]/src/webrtc/build/ios/chromium.fake/ios.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| @@ -155,7 +95,7 @@
|
| "cmd": [
|
| "echo",
|
| "-e",
|
| - "{\n \"GYP_DEFINES\": {\n \"OS\": \"ios\", \n \"component\": \"static_library\", \n \"fake gyp define 1\": \"fake value 1\", \n \"fake gyp define 2\": \"fake value 2\"\n }, \n \"additional_compile_targets\": [\n \"All\"\n ], \n \"compiler\": \"ninja\", \n \"configuration\": \"Debug\", \n \"env\": {}, \n \"gn_args\": [], \n \"mb_type\": null, \n \"sdk\": \"iphonesimulator8.0\", \n \"tests\": [\n {\n \"app\": \"fake tests 1\", \n \"device type\": \"fake device\", \n \"os\": \"8.0\"\n }, \n {\n \"app\": \"fake tests 2\", \n \"device type\": \"fake device\", \n \"os\": \"7.1\"\n }\n ], \n \"triggered bots\": {}, \n \"xcode version\": \"fake xcode version\"\n}"
|
| + "{\n \"GYP_DEFINES\": {\n \"OS\": \"ios\", \n \"component\": \"static_library\", \n \"fake gyp define 1\": \"fake value 1\", \n \"fake gyp define 2\": \"fake value 2\"\n }, \n \"additional_compile_targets\": [\n \"All\"\n ], \n \"compiler\": \"ninja\", \n \"configuration\": \"Debug\", \n \"env\": {}, \n \"gn_args\": [], \n \"mb_type\": null, \n \"sdk\": \"iphonesimulator8.0\", \n \"tests\": [\n {\n \"app\": \"fake tests 1\", \n \"device type\": \"fake device\", \n \"os\": \"8.0\"\n }, \n {\n \"app\": \"fake tests 2\", \n \"device type\": \"fake device\", \n \"os\": \"7.1\"\n }\n ], \n \"triggered bots\": {}, \n \"use_analyze\": true, \n \"xcode version\": \"fake xcode version\"\n}"
|
| ],
|
| "cwd": "[SLAVE_BUILD]",
|
| "name": "finalize build config"
|
|
|