| Index: scripts/slave/recipes/blink_trybot.expected/compile_failure_bot_update.json
|
| diff --git a/scripts/slave/recipes/blink_trybot.expected/compile_failure_bot_update.json b/scripts/slave/recipes/blink_trybot.expected/compile_failure_bot_update.json
|
| index a11c5f938afc2b59f677d42b7135ccd7612defa1..20d283d5b29da77b5a9f310019eeaa2182007f1a 100644
|
| --- a/scripts/slave/recipes/blink_trybot.expected/compile_failure_bot_update.json
|
| +++ b/scripts/slave/recipes/blink_trybot.expected/compile_failure_bot_update.json
|
| @@ -25,7 +25,8 @@
|
| "--revision",
|
| "src@HEAD",
|
| "--revision",
|
| - "src/third_party/WebKit@HEAD"
|
| + "src/third_party/WebKit@HEAD",
|
| + "--force"
|
| ],
|
| "name": "bot_update",
|
| "~followup_annotations": [
|
| @@ -106,283 +107,8 @@
|
| ]
|
| },
|
| {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport os, sys\nfrom common import chromium_utils\n\nfor p in [os.path.join(sys.argv[1], x) for x in os.listdir(sys.argv[1])]:\n if os.path.isdir(p):\n chromium_utils.RemoveDirectory(p)\n else:\n os.unlink(p)\n",
|
| - "[SLAVE_BUILD]"
|
| - ],
|
| - "name": "rmcontents slave build directory",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@for p in [os.path.join(sys.argv[1], x) for x in os.listdir(sys.argv[1])]:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ if os.path.isdir(p):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(p)@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ else:@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ os.unlink(p)@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/bot_update.py",
|
| - "--master",
|
| - "tryserver.blink",
|
| - "--builder",
|
| - "linux_blink_bot_update",
|
| - "--slave",
|
| - "TestSlavename",
|
| - "--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}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src-internal', 'url': 'svn://svn-mirror.golo.chromium.org/chrome-internal/trunk/src-internal'}]",
|
| - "--root",
|
| - "src/third_party/WebKit",
|
| - "--revision_mapping_file",
|
| - "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarm_client\": \"got_swarm_client_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
|
| - "--issue",
|
| - "12853011",
|
| - "--patchset",
|
| - "1",
|
| - "--output_json",
|
| - "/path/to/tmp/json",
|
| - "--revision",
|
| - "src@HEAD",
|
| - "--revision",
|
| - "src/third_party/WebKit@HEAD"
|
| - ],
|
| - "name": "bot_update (2)",
|
| - "~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@ \"patch_root\": \"src/third_party/WebKit\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision\": 274981, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_nacl_revision_git\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision\": 170242, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision_git\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_swarm_client_revision\": 200767, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_swarm_client_revision_git\": \"932d037f462c12db1f3210de8ea1b2964f363f47\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision\": 276089, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_swarming_client_revision_git\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision\": 43426, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_v8_revision_git\": \"801ada225ddc271c132c3a35f03975671d43e399\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision\": 124383, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webkit_revision_git\": \"5e2293dffc3cd07d37fbedea3b500f0eb650614d\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision\": 120644, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_webrtc_revision_git\": \"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| - "@@@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@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webrtc_revision@120644@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision@170242@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarm_client_revision_git@\"932d037f462c12db1f3210de8ea1b2964f363f47\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_nacl_revision_git@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webkit_revision_git@\"5e2293dffc3cd07d37fbedea3b500f0eb650614d\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_webrtc_revision_git@\"0f90628433546e61d9268596da93418c623137f4\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_v8_revision_git@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarm_client_revision@200767@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_swarming_client_revision_git@\"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision_git@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[DEPOT_TOOLS]/gclient.py",
|
| - "runhooks"
|
| - ],
|
| - "env": {
|
| - "GYP_DEFINES": "component=shared_library dcheck_always_on=1 fastbuild=1 gomadir='[BUILD]/goma' target_arch=x64 use_goma=1"
|
| - },
|
| - "name": "gclient runhooks (2)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/compile.py",
|
| - "--target",
|
| - "Debug",
|
| - "--src-dir",
|
| - "[SLAVE_BUILD]/src",
|
| - "--build-tool",
|
| - "ninja",
|
| - "--compiler",
|
| - "goma",
|
| - "--goma-dir",
|
| - "[BUILD]/goma",
|
| - "--",
|
| - "blink_tests"
|
| - ],
|
| - "name": "compile (2)"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/chromium/lint_test_files_wrapper.py",
|
| - "--build-dir",
|
| - "[SLAVE_BUILD]/src/out",
|
| - "--target",
|
| - "Debug"
|
| - ],
|
| - "name": "webkit_lint"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/chromium/test_webkitpy_wrapper.py",
|
| - "--build-dir",
|
| - "[SLAVE_BUILD]/src/out",
|
| - "--target",
|
| - "Debug"
|
| - ],
|
| - "name": "webkit_python_tests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_blink_bot_update\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_blink_bot_update\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--builder-name=linux_blink_bot_update",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "webkit_unit_tests"
|
| - ],
|
| - "name": "webkit_unit_tests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_blink_bot_update\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_blink_bot_update\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--builder-name=linux_blink_bot_update",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "blink_platform_unittests"
|
| - ],
|
| - "name": "blink_platform_unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_blink_bot_update\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_blink_bot_update\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--builder-name=linux_blink_bot_update",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "blink_heap_unittests"
|
| - ],
|
| - "name": "blink_heap_unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_blink_bot_update\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_blink_bot_update\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--builder-name=linux_blink_bot_update",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "wtf_unittests"
|
| - ],
|
| - "name": "wtf_unittests"
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/runtest.py",
|
| - "--target",
|
| - "Debug",
|
| - "--no-xvfb",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_blink_bot_update\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_blink_bot_update\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--builder-name=linux_blink_bot_update",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--run-python-script",
|
| - "[BUILD]/scripts/slave/chromium/layout_test_wrapper.py",
|
| - "--target",
|
| - "Debug",
|
| - "-o",
|
| - "[SLAVE_BUILD]/layout-test-results",
|
| - "--build-dir",
|
| - "[SLAVE_BUILD]/src/out",
|
| - "--json-test-results",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "name": "webkit_tests (with patch)",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@<br/>Total executed: 9001<br/>@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "[BUILD]/scripts/slave/chromium/archive_layout_test_results.py",
|
| - "--results-dir",
|
| - "[SLAVE_BUILD]/layout-test-results",
|
| - "--build-dir",
|
| - "[SLAVE_BUILD]/src/out",
|
| - "--build-number",
|
| - "571",
|
| - "--builder-name",
|
| - "linux_blink_bot_update",
|
| - "--gs-bucket",
|
| - "gs://chromium-layout-test-archives",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_blink_bot_update\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"buildername\": \"linux_blink_bot_update\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.blink\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"blink_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": \"HEAD\", \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src/third_party/WebKit\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| - ],
|
| - "name": "archive_webkit_tests_results",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LINK@layout_test_results@https://storage.googleapis.com/chromium-layout-test-archives/linux_blink_bot_update/571/layout-test-results/results.html@@@",
|
| - "@@@STEP_LINK@(zip)@https://storage.googleapis.com/chromium-layout-test-archives/linux_blink_bot_update/571/layout-test-results.zip@@@"
|
| - ]
|
| + "name": "$final_result",
|
| + "reason": "Step('compile') failed with return_code 1",
|
| + "status_code": 1
|
| }
|
| ]
|
|
|