[cbuild] Remove support for legacy results
Change-Id: I506faad9b355265a5514c5db2265bd13d7161061
Reviewed-on: https://dart-review.googlesource.com/c/recipes/+/178780
Auto-Submit: Alexander Thomas <athom@google.com>
Reviewed-by: Karl Klose <karlklose@google.com>
Commit-Queue: Karl Klose <karlklose@google.com>
diff --git a/recipes/dart/cbuild.expected/with-legacy-results.json b/recipes/dart/cbuild.expected/with-legacy-results.json
deleted file mode 100644
index 47e2b1d..0000000
--- a/recipes/dart/cbuild.expected/with-legacy-results.json
+++ /dev/null
@@ -1,626 +0,0 @@
-[
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "ls",
- "gs://dart-cbuild-test-results"
- ],
- "infra_step": true,
- "name": "gsutil find cbuild results"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "gs://dart-cbuild-test-results/hash-of-success",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "gsutil download cbuild result for hash-of-success",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output[result]@true@@@",
- "@@@STEP_LOG_END@json.output[result]@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "gs://dart-cbuild-test-results/hash-of-regression",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "gsutil download cbuild result for hash-of-regression",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output[result]@false@@@",
- "@@@STEP_LOG_END@json.output[result]@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "gs://dart-cbuild-test-results/hash-of-presubmit",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "gsutil download cbuild result for hash-of-presubmit",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output[result]@false@@@",
- "@@@STEP_LOG_END@json.output[result]@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "cp",
- "gs://dart-cbuild-test-results/hash-of-failure",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "gsutil download cbuild result for hash-of-failure",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output[result]@false@@@",
- "@@@STEP_LOG_END@json.output[result]@@@"
- ]
- },
- {
- "cmd": [
- "bb",
- "batch",
- "-host",
- "cr-buildbucket.appspot.com"
- ],
- "infra_step": true,
- "name": "buildbucket.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-success\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"result\": \"SUCCESS\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-success\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-regression\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"result\": \"FAILURE\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-regression\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-presubmit\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"result\": \"FAILURE\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-presubmit\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133d\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-failure\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"result\": \"FAILURE\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-failure\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001340\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"ci.sandbox\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"google\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514000\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"ci.sandbox\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"google\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514001\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"ci.sandbox\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"google\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514002\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"ci.sandbox\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"builder\": \"google\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514003\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@",
- "@@@STEP_LOG_LINE@request@{@@@",
- "@@@STEP_LOG_LINE@request@ \"requests\": [@@@",
- "@@@STEP_LOG_LINE@request@ {@@@",
- "@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"bucket\": \"ci.sandbox\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"google\"@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
- "@@@STEP_LOG_LINE@request@ \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", @@@",
- "@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
- "@@@STEP_LOG_LINE@request@ \"id\": \"hash-of-success\", @@@",
- "@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"result\": \"SUCCESS\", @@@",
- "@@@STEP_LOG_LINE@request@ \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-success\"@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", @@@",
- "@@@STEP_LOG_LINE@request@ \"tags\": [@@@",
- "@@@STEP_LOG_LINE@request@ {@@@",
- "@@@STEP_LOG_LINE@request@ \"key\": \"user_agent\", @@@",
- "@@@STEP_LOG_LINE@request@ \"value\": \"recipe\"@@@",
- "@@@STEP_LOG_LINE@request@ }@@@",
- "@@@STEP_LOG_LINE@request@ ]@@@",
- "@@@STEP_LOG_LINE@request@ }@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ {@@@",
- "@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"bucket\": \"ci.sandbox\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"google\"@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
- "@@@STEP_LOG_LINE@request@ \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", @@@",
- "@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
- "@@@STEP_LOG_LINE@request@ \"id\": \"hash-of-regression\", @@@",
- "@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"result\": \"FAILURE\", @@@",
- "@@@STEP_LOG_LINE@request@ \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-regression\"@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", @@@",
- "@@@STEP_LOG_LINE@request@ \"tags\": [@@@",
- "@@@STEP_LOG_LINE@request@ {@@@",
- "@@@STEP_LOG_LINE@request@ \"key\": \"user_agent\", @@@",
- "@@@STEP_LOG_LINE@request@ \"value\": \"recipe\"@@@",
- "@@@STEP_LOG_LINE@request@ }@@@",
- "@@@STEP_LOG_LINE@request@ ]@@@",
- "@@@STEP_LOG_LINE@request@ }@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ {@@@",
- "@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"bucket\": \"ci.sandbox\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"google\"@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
- "@@@STEP_LOG_LINE@request@ \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", @@@",
- "@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
- "@@@STEP_LOG_LINE@request@ \"id\": \"hash-of-presubmit\", @@@",
- "@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"result\": \"FAILURE\", @@@",
- "@@@STEP_LOG_LINE@request@ \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-presubmit\"@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ \"requestId\": \"0-00000000-0000-0000-0000-00000000133d\", @@@",
- "@@@STEP_LOG_LINE@request@ \"tags\": [@@@",
- "@@@STEP_LOG_LINE@request@ {@@@",
- "@@@STEP_LOG_LINE@request@ \"key\": \"user_agent\", @@@",
- "@@@STEP_LOG_LINE@request@ \"value\": \"recipe\"@@@",
- "@@@STEP_LOG_LINE@request@ }@@@",
- "@@@STEP_LOG_LINE@request@ ]@@@",
- "@@@STEP_LOG_LINE@request@ }@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ {@@@",
- "@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"bucket\": \"ci.sandbox\", @@@",
- "@@@STEP_LOG_LINE@request@ \"builder\": \"google\"@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
- "@@@STEP_LOG_LINE@request@ \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", @@@",
- "@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
- "@@@STEP_LOG_LINE@request@ \"id\": \"hash-of-failure\", @@@",
- "@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@request@ \"result\": \"FAILURE\", @@@",
- "@@@STEP_LOG_LINE@request@ \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-failure\"@@@",
- "@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ \"requestId\": \"0-00000000-0000-0000-0000-000000001340\", @@@",
- "@@@STEP_LOG_LINE@request@ \"tags\": [@@@",
- "@@@STEP_LOG_LINE@request@ {@@@",
- "@@@STEP_LOG_LINE@request@ \"key\": \"user_agent\", @@@",
- "@@@STEP_LOG_LINE@request@ \"value\": \"recipe\"@@@",
- "@@@STEP_LOG_LINE@request@ }@@@",
- "@@@STEP_LOG_LINE@request@ ]@@@",
- "@@@STEP_LOG_LINE@request@ }@@@",
- "@@@STEP_LOG_LINE@request@ }@@@",
- "@@@STEP_LOG_LINE@request@ ]@@@",
- "@@@STEP_LOG_LINE@request@}@@@",
- "@@@STEP_LOG_END@request@@@",
- "@@@STEP_LINK@8922054662172514000@https://cr-buildbucket.appspot.com/build/8922054662172514000@@@",
- "@@@STEP_LINK@8922054662172514001@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@",
- "@@@STEP_LINK@8922054662172514002@https://cr-buildbucket.appspot.com/build/8922054662172514002@@@",
- "@@@STEP_LINK@8922054662172514003@https://cr-buildbucket.appspot.com/build/8922054662172514003@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
- "--json-file",
- "/path/to/tmp/json",
- "--url",
- "https://dart.googlesource.com/sdk/+/hash-of-success",
- "--format",
- "json"
- ],
- "name": "download change-id for hash-of-success",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"author\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"testauthor@fake.chromium.org\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"Test Author\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"commit\": \"0d2bb3f76c86347700efe8a5d936e7715f539fae\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"committer\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"testauthor@fake.chromium.org\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"Test Author\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"message\": \"Subject\\n\\nChange-Id: Ihash-of-success\\n\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"parents\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"1d344d4425164843176607d23dd70cdb01a45e45\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree\": \"da90f74c609fe03335481cb8e21eaaca85602e49\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree_diff\": []@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [],
- "name": "install infra/tools/luci/gerrit"
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "ensure-directory",
- "--mode",
- "0777",
- "[CACHE]/cipd/infra/tools/luci/gerrit/pinned-gerrit-version"
- ],
- "infra_step": true,
- "name": "install infra/tools/luci/gerrit.ensure package directory",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[CACHE]/cipd/infra/tools/luci/gerrit/pinned-gerrit-version",
- "-ensure-file",
- "infra/tools/luci/gerrit/${platform} pinned-gerrit-version",
- "-max-threads",
- "0",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "install infra/tools/luci/gerrit.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-pinned-gerrit-ve\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/tools/luci/gerrit/pinned-gerrit-version/gerrit",
- "set-review",
- "-host",
- "https://dart-review.googlesource.com",
- "-input",
- "{\"change_id\": \"Ihash-of-success\", \"input\": {\"message\": \"go/dart-cbuild result: SUCCESS\\n\\nDetails: https://goto.google.com/dart-cbuild/find/hash-of-success\\n\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "update gerrit for hash-of-success",
- "timeout": 600,
- "~followup_annotations": [
- "@@@STEP_LOG_END@json.output (invalid)@@@",
- "@@@STEP_LOG_LINE@json.output (exception)@No JSON object could be decoded@@@",
- "@@@STEP_LOG_END@json.output (exception)@@@",
- "@@@STEP_LOG_LINE@json.input@{@@@",
- "@@@STEP_LOG_LINE@json.input@ \"change_id\": \"Ihash-of-success\", @@@",
- "@@@STEP_LOG_LINE@json.input@ \"input\": {@@@",
- "@@@STEP_LOG_LINE@json.input@ \"message\": \"go/dart-cbuild result: SUCCESS\\n\\nDetails: https://goto.google.com/dart-cbuild/find/hash-of-success\\n\"@@@",
- "@@@STEP_LOG_LINE@json.input@ }, @@@",
- "@@@STEP_LOG_LINE@json.input@ \"revision_id\": \"current\"@@@",
- "@@@STEP_LOG_LINE@json.input@}@@@",
- "@@@STEP_LOG_END@json.input@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "rm",
- "gs://dart-cbuild-test-results/hash-of-success"
- ],
- "infra_step": true,
- "name": "gsutil delete result for hash-of-success"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
- "--json-file",
- "/path/to/tmp/json",
- "--url",
- "https://dart.googlesource.com/sdk/+/hash-of-regression",
- "--format",
- "json"
- ],
- "name": "download change-id for hash-of-regression",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"author\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"testauthor@fake.chromium.org\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"Test Author\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"commit\": \"7c6ab322bd26f369fb93303a1c866f79ec59a48d\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"committer\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"testauthor@fake.chromium.org\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"Test Author\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"message\": \"Subject\\n\\nChange-Id: Ihash-of-regression\\n\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"parents\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"f90914c0e844c152907d395449631c07d536a670\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree\": \"ef3e32d5c0c7a44c7af721dd17ebf0ff671a4596\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree_diff\": []@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/tools/luci/gerrit/pinned-gerrit-version/gerrit",
- "set-review",
- "-host",
- "https://dart-review.googlesource.com",
- "-input",
- "{\"change_id\": \"Ihash-of-regression\", \"input\": {\"message\": \"go/dart-cbuild result: FAILURE\\n\\nDetails: https://goto.google.com/dart-cbuild/find/hash-of-regression\\n\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "update gerrit for hash-of-regression",
- "timeout": 600,
- "~followup_annotations": [
- "@@@STEP_LOG_END@json.output (invalid)@@@",
- "@@@STEP_LOG_LINE@json.output (exception)@No JSON object could be decoded@@@",
- "@@@STEP_LOG_END@json.output (exception)@@@",
- "@@@STEP_LOG_LINE@json.input@{@@@",
- "@@@STEP_LOG_LINE@json.input@ \"change_id\": \"Ihash-of-regression\", @@@",
- "@@@STEP_LOG_LINE@json.input@ \"input\": {@@@",
- "@@@STEP_LOG_LINE@json.input@ \"message\": \"go/dart-cbuild result: FAILURE\\n\\nDetails: https://goto.google.com/dart-cbuild/find/hash-of-regression\\n\"@@@",
- "@@@STEP_LOG_LINE@json.input@ }, @@@",
- "@@@STEP_LOG_LINE@json.input@ \"revision_id\": \"current\"@@@",
- "@@@STEP_LOG_LINE@json.input@}@@@",
- "@@@STEP_LOG_END@json.input@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "rm",
- "gs://dart-cbuild-test-results/hash-of-regression"
- ],
- "infra_step": true,
- "name": "gsutil delete result for hash-of-regression"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
- "--json-file",
- "/path/to/tmp/json",
- "--url",
- "https://dart.googlesource.com/sdk/+/hash-of-presubmit",
- "--format",
- "json"
- ],
- "name": "download change-id for hash-of-presubmit",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"author\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"testauthor@fake.chromium.org\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"Test Author\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"commit\": \"593f1897a2b042e60b19865b1e90053cb7e6e4ab\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"committer\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"testauthor@fake.chromium.org\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"Test Author\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"message\": \"Subject\\n\\nChange-Id: Ihash-of-presubmit\\n\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"parents\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"86619208a86754151ab91ef3aae04ec3ecc48bfb\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree\": \"0319208908f6bd662c55cdb53eb307df1190ef29\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree_diff\": []@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/tools/luci/gerrit/pinned-gerrit-version/gerrit",
- "set-review",
- "-host",
- "https://dart-review.googlesource.com",
- "-input",
- "{\"change_id\": \"Ihash-of-presubmit\", \"input\": {\"message\": \"go/dart-cbuild result: FAILURE\\n\\nDetails: https://goto.google.com/dart-cbuild/find/hash-of-presubmit\\n\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "update gerrit for hash-of-presubmit",
- "timeout": 600,
- "~followup_annotations": [
- "@@@STEP_LOG_END@json.output (invalid)@@@",
- "@@@STEP_LOG_LINE@json.output (exception)@No JSON object could be decoded@@@",
- "@@@STEP_LOG_END@json.output (exception)@@@",
- "@@@STEP_LOG_LINE@json.input@{@@@",
- "@@@STEP_LOG_LINE@json.input@ \"change_id\": \"Ihash-of-presubmit\", @@@",
- "@@@STEP_LOG_LINE@json.input@ \"input\": {@@@",
- "@@@STEP_LOG_LINE@json.input@ \"message\": \"go/dart-cbuild result: FAILURE\\n\\nDetails: https://goto.google.com/dart-cbuild/find/hash-of-presubmit\\n\"@@@",
- "@@@STEP_LOG_LINE@json.input@ }, @@@",
- "@@@STEP_LOG_LINE@json.input@ \"revision_id\": \"current\"@@@",
- "@@@STEP_LOG_LINE@json.input@}@@@",
- "@@@STEP_LOG_END@json.input@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "rm",
- "gs://dart-cbuild-test-results/hash-of-presubmit"
- ],
- "infra_step": true,
- "name": "gsutil delete result for hash-of-presubmit"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gitiles]/resources/gerrit_client.py",
- "--json-file",
- "/path/to/tmp/json",
- "--url",
- "https://dart.googlesource.com/sdk/+/hash-of-failure",
- "--format",
- "json"
- ],
- "name": "download change-id for hash-of-failure",
- "~followup_annotations": [
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"author\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"testauthor@fake.chromium.org\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"Test Author\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"commit\": \"7a8a22c2b56c47004f5f57f56c246a3cf62a4b85\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"committer\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"testauthor@fake.chromium.org\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"Test Author\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"message\": \"Subject\\n\\nChange-Id: Ihash-of-failure\\n\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"parents\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"4913a1bdba38942821330018264de93863879a73\"@@@",
- "@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree\": \"9b421a2b9d5ccc2a8e5585bdd05db6aed18b7932\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree_diff\": []@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[CACHE]/cipd/infra/tools/luci/gerrit/pinned-gerrit-version/gerrit",
- "set-review",
- "-host",
- "https://dart-review.googlesource.com",
- "-input",
- "{\"change_id\": \"Ihash-of-failure\", \"input\": {\"message\": \"go/dart-cbuild result: FAILURE\\n\\nDetails: https://goto.google.com/dart-cbuild/find/hash-of-failure\\n\"}, \"revision_id\": \"current\"}",
- "-output",
- "/path/to/tmp/json"
- ],
- "name": "update gerrit for hash-of-failure",
- "timeout": 600,
- "~followup_annotations": [
- "@@@STEP_LOG_END@json.output (invalid)@@@",
- "@@@STEP_LOG_LINE@json.output (exception)@No JSON object could be decoded@@@",
- "@@@STEP_LOG_END@json.output (exception)@@@",
- "@@@STEP_LOG_LINE@json.input@{@@@",
- "@@@STEP_LOG_LINE@json.input@ \"change_id\": \"Ihash-of-failure\", @@@",
- "@@@STEP_LOG_LINE@json.input@ \"input\": {@@@",
- "@@@STEP_LOG_LINE@json.input@ \"message\": \"go/dart-cbuild result: FAILURE\\n\\nDetails: https://goto.google.com/dart-cbuild/find/hash-of-failure\\n\"@@@",
- "@@@STEP_LOG_LINE@json.input@ }, @@@",
- "@@@STEP_LOG_LINE@json.input@ \"revision_id\": \"current\"@@@",
- "@@@STEP_LOG_LINE@json.input@}@@@",
- "@@@STEP_LOG_END@json.input@@@"
- ]
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
- "--",
- "RECIPE_REPO[depot_tools]/gsutil.py",
- "----",
- "rm",
- "gs://dart-cbuild-test-results/hash-of-failure"
- ],
- "infra_step": true,
- "name": "gsutil delete result for hash-of-failure"
- },
- {
- "name": "$result"
- }
-]
\ No newline at end of file
diff --git a/recipes/dart/cbuild.py b/recipes/dart/cbuild.py
index df4d890..301a411 100644
--- a/recipes/dart/cbuild.py
+++ b/recipes/dart/cbuild.py
@@ -90,16 +90,9 @@
api.json.output(name='result'),
name='download cbuild result for %s' % commit_hash)
cbuild_result_json = download.json.outputs['result']
- cbuild_success = None
- cbuild_regression = None
- cbuild_presubmit = None
- if cbuild_result_json in (True, False):
- # TODO(athom): remove support for non-json legacy results.
- cbuild_success = cbuild_result_json
- else:
- cbuild_success = cbuild_result_json['result']
- cbuild_regression = cbuild_result_json.get('regression', False)
- cbuild_presubmit = cbuild_result_json.get('presubmit', False)
+ cbuild_success = cbuild_result_json['result']
+ cbuild_regression = cbuild_result_json.get('regression', False)
+ cbuild_presubmit = cbuild_result_json.get('presubmit', False)
assert not (cbuild_success and cbuild_regression)
@@ -214,30 +207,6 @@
)
yield api.test(
- 'with-legacy-results',
- api.step_data(
- 'gsutil find cbuild results',
- stdout=api.raw_io.output(CBUILD_RESULT_URLS)),
- _cbuild_results('hash-of-success', True),
- _cbuild_results('hash-of-regression', False),
- _cbuild_results('hash-of-presubmit', False),
- _cbuild_results('hash-of-failure', False),
- api.post_process(post_process.MustRun,
- 'update gerrit for hash-of-success'),
- api.post_process(post_process.MustRun,
- 'update gerrit for hash-of-regression'),
- api.post_process(post_process.MustRun,
- 'update gerrit for hash-of-failure'),
- api.post_process(post_process.MustRun,
- 'gsutil delete result for hash-of-success'),
- api.post_process(post_process.MustRun,
- 'gsutil delete result for hash-of-regression'),
- api.post_process(post_process.MustRun,
- 'gsutil delete result for hash-of-failure'),
- api.post_process(post_process.StatusSuccess),
- )
-
- yield api.test(
'experimental-with-results',
api.runtime(is_experimental=True),
api.step_data(
@@ -266,8 +235,12 @@
api.step_data(
'gsutil find cbuild results',
stdout=api.raw_io.output('gs://dart-cbuild-test-results/hash')),
- api.step_data('gsutil download cbuild result for hash',
- api.json.output(False, name='result')),
+ api.step_data(
+ 'gsutil download cbuild result for hash',
+ api.json.output({
+ 'result': False,
+ 'regression': False
+ }, name='result')),
api.step_data('download change-id for hash',
api.gitiles.make_commit_test_data('hash', 'Subject\n')),
api.post_process(post_process.DoesNotRunRE, '.*update gerrit.*'),
