| Index: scripts/slave/recipes/chromium_trybot.expected/telemetry_failures.json
|
| diff --git a/scripts/slave/recipes/chromium_trybot.expected/checklicenses_failure.json b/scripts/slave/recipes/chromium_trybot.expected/telemetry_failures.json
|
| similarity index 89%
|
| copy from scripts/slave/recipes/chromium_trybot.expected/checklicenses_failure.json
|
| copy to scripts/slave/recipes/chromium_trybot.expected/telemetry_failures.json
|
| index 2420724476e3ffe8968617b2c9357a7915399e19..ccd5143b168b09a058e9010b2830da8106681589 100644
|
| --- a/scripts/slave/recipes/chromium_trybot.expected/checklicenses_failure.json
|
| +++ b/scripts/slave/recipes/chromium_trybot.expected/telemetry_failures.json
|
| @@ -205,12 +205,7 @@
|
| ],
|
| "name": "checklicenses (with patch)",
|
| "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@[@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"filename\": \"base/basictypes.h\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"license\": \"UNKNOWN\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@]@@@",
|
| + "@@@STEP_LOG_LINE@json.output@[]@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| @@ -239,7 +234,12 @@
|
| "--write-full-results-to",
|
| "/path/to/tmp/json"
|
| ],
|
| - "name": "telemetry_unittests (with patch)"
|
| + "name": "telemetry_unittests (with patch)",
|
| + "~followup_annotations": [
|
| + "step returned non-zero exit code: 5",
|
| + "@@@STEP_TEXT@<br/>unexpected_failures:<br/>bad.totally-bad-probably.html<br/>tricky.totally-maybe-not-awesome.html<br/>@@@",
|
| + "@@@STEP_FAILURE@@@"
|
| + ]
|
| },
|
| {
|
| "allow_subannotations": true,
|
| @@ -430,16 +430,54 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/tools/checklicenses/checklicenses.py",
|
| - "--root",
|
| + "[BUILD]/scripts/slave/compile.py",
|
| + "--target",
|
| + "Release",
|
| + "--src-dir",
|
| "[SLAVE_BUILD]/src",
|
| - "--json",
|
| - "/path/to/tmp/json"
|
| + "--build-tool",
|
| + "ninja",
|
| + "--compiler",
|
| + "goma",
|
| + "--goma-dir",
|
| + "[BUILD]/goma",
|
| + "--",
|
| + "chrome"
|
| ],
|
| - "name": "checklicenses (without patch)",
|
| + "name": "compile (without patch)"
|
| + },
|
| + {
|
| + "allow_subannotations": true,
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "[BUILD]/scripts/slave/runtest.py",
|
| + "--target",
|
| + "Release",
|
| + "--xvfb",
|
| + "--factory-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--build-properties",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"branch\": \"\", \"build_config\": \"Release\", \"buildername\": \"linux_chromium_rel\", \"buildnumber\": 571, \"issue\": 12853011, \"mastername\": \"tryserver.chromium.linux\", \"patchset\": 1, \"project\": \"chrome\", \"recipe\": \"chromium_trybot\", \"repository\": \"\", \"requester\": \"commit-bot@chromium.org\", \"revision\": null, \"rietveld\": \"https://codereview.chromium.org\", \"root\": \"src\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "--annotate=gtest",
|
| + "--test-type=telemetry_unittests",
|
| + "--builder-name=linux_chromium_rel",
|
| + "--slave-name=TestSlavename",
|
| + "--build-number=571",
|
| + "--run-python-script",
|
| + "[SLAVE_BUILD]/src/tools/telemetry/run_tests",
|
| + "--browser=release",
|
| + "--retry-limit=3",
|
| + "--write-full-results-to",
|
| + "/path/to/tmp/json",
|
| + "bad.totally-bad-probably.html",
|
| + "tricky.totally-maybe-not-awesome.html"
|
| + ],
|
| + "name": "telemetry_unittests (without patch)",
|
| "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@[]@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| + "step returned non-zero exit code: 5",
|
| + "@@@STEP_TEXT@<br/>unexpected_failures:<br/>bad.totally-bad-probably.html<br/>tricky.totally-maybe-not-awesome.html<br/>@@@",
|
| + "@@@STEP_FAILURE@@@"
|
| ]
|
| },
|
| {
|
| @@ -447,12 +485,11 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, json\nfailures = json.load(open(sys.argv[1], 'rb'))\n\nsuccess = True\n\nif failures['new']:\n success = False\n print 'New failures:'\n for f in failures['new']:\n print f\n\nif failures['ignored']:\n print 'Ignored failures:'\n for f in failures['ignored']:\n print f\n\nsys.exit(0 if success else 1)\n",
|
| - "{\"ignored\": [], \"new\": [\"base/basictypes.h: UNKNOWN\"]}"
|
| + "{\"ignored\": [\"bad.totally-bad-probably.html\", \"tricky.totally-maybe-not-awesome.html\"], \"new\": []}"
|
| ],
|
| - "name": "checklicenses",
|
| + "name": "telemetry_unittests",
|
| "~followup_annotations": [
|
| - "step returned non-zero exit code: 1",
|
| - "@@@STEP_TEXT@<br/>failures:<br/>base/basictypes.h: UNKNOWN<br/>@@@",
|
| + "@@@STEP_TEXT@<br/>ignored:<br/>bad.totally-bad-probably.html<br/>tricky.totally-maybe-not-awesome.html<br/>@@@",
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| "@@@STEP_LOG_LINE@python.inline@import sys, json@@@",
|
| "@@@STEP_LOG_LINE@python.inline@failures = json.load(open(sys.argv[1], 'rb'))@@@",
|
| @@ -472,12 +509,7 @@
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| "@@@STEP_LOG_LINE@python.inline@sys.exit(0 if success else 1)@@@",
|
| "@@@STEP_LOG_END@python.inline@@@",
|
| - "@@@STEP_FAILURE@@@"
|
| + "@@@STEP_WARNINGS@@@"
|
| ]
|
| - },
|
| - {
|
| - "name": "$final_result",
|
| - "reason": "Step('checklicenses') failed with return_code 1",
|
| - "status_code": 1
|
| }
|
| ]
|
|
|