Roll recipe dependencies (nontrivial).

This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (e.g. depot_tools) into downstream projects (e.g. tools/build). Please review the expectation changes, and LGTM+CQ. More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug. recipe_engine: https://crrev.com/80e1d4b24dded35128a888c2de959ccd0dd8d140 Remove step exit code from test expectations. (iannucci@chromium.org) https://crrev.com/5c579aefde72744956934c8805273cd43f53cd1d Move StepConfig and friends to their own module, engine_step. (iannucci@chromium.org) R=kjlubick@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Bugdroid-Send-Email: False Change-Id: Idcb76229ca11e137b200f5712617008d34490d3a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/204286 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Eric Boren <borenet@google.com>
2019-03-27 16:36:10 -07:00 · 2019-03-27 16:36:10 -07:00 · edf562397e
commit edf562397e
parent 78a282f49b
22 changed files with 2 additions and 49 deletions
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json
@ -669,7 +669,6 @@
    "name": "Scale CPU 0 to 0.600000",
    "timeout": 30,
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_LOG_LINE@python.inline@@@@",
      "@@@STEP_LOG_LINE@python.inline@import os@@@",
      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
@ -745,7 +744,6 @@
    "name": "Scale CPU 0 to 0.600000 (attempt 2)",
    "timeout": 30,
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_LOG_LINE@python.inline@@@@",
      "@@@STEP_LOG_LINE@python.inline@import os@@@",
      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
@ -821,7 +819,6 @@
    "name": "Scale CPU 0 to 0.600000 (attempt 3)",
    "timeout": 30,
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_LOG_LINE@python.inline@@@@",
      "@@@STEP_LOG_LINE@python.inline@import os@@@",
      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json
@ -669,7 +669,6 @@
    "name": "Scale CPU 4 to 0.600000",
    "timeout": 30,
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_LOG_LINE@python.inline@@@@",
      "@@@STEP_LOG_LINE@python.inline@import os@@@",
      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
@ -745,7 +744,6 @@
    "name": "Scale CPU 4 to 0.600000 (attempt 2)",
    "timeout": 30,
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_LOG_LINE@python.inline@@@@",
      "@@@STEP_LOG_LINE@python.inline@import os@@@",
      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
@ -821,7 +819,6 @@
    "name": "Scale CPU 4 to 0.600000 (attempt 3)",
    "timeout": 30,
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_LOG_LINE@python.inline@@@@",
      "@@@STEP_LOG_LINE@python.inline@import os@@@",
      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json
@ -669,7 +669,6 @@
    "name": "Scale CPU 0 to 0.600000",
    "timeout": 30,
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_LOG_LINE@python.inline@@@@",
      "@@@STEP_LOG_LINE@python.inline@import os@@@",
      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json
@ -1037,7 +1037,6 @@
    "name": "dump log",
    "timeout": 300,
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_LOG_LINE@python.inline@@@@",
      "@@@STEP_LOG_LINE@python.inline@import os@@@",
      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json
@ -365,7 +365,6 @@
    "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
    "stdout": "/path/to/tmp/",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_EXCEPTION@@@"
    ]
  },
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json
@ -142,7 +142,6 @@
    "infra_step": true,
    "name": "mkdir /sdcard/revenge_of_the_skiabot/resources",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_EXCEPTION@@@"
    ]
  },
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json
@ -142,7 +142,6 @@
    "infra_step": true,
    "name": "mkdir /sdcard/revenge_of_the_skiabot/resources",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_EXCEPTION@@@"
    ]
  },
@ -193,7 +192,6 @@
    "infra_step": true,
    "name": "mkdir /sdcard/revenge_of_the_skiabot/resources (attempt 2)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_EXCEPTION@@@"
    ]
  },
@ -244,7 +242,6 @@
    "infra_step": true,
    "name": "mkdir /sdcard/revenge_of_the_skiabot/resources (attempt 3)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_EXCEPTION@@@"
    ]
  },
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install.json
@ -113,7 +113,6 @@
    "infra_step": true,
    "name": "install_dm",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_EXCEPTION@@@"
    ]
  },
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_ios_install_retries_exhausted.json
@ -113,7 +113,6 @@
    "infra_step": true,
    "name": "install_dm",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_EXCEPTION@@@"
    ]
  },
@ -143,7 +142,6 @@
    "infra_step": true,
    "name": "install_dm (attempt 2)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_EXCEPTION@@@"
    ]
  },
--- a/infra/bots/recipe_modules/gsutil/examples/full.expected/failed_all_uploads.json
+++ b/infra/bots/recipe_modules/gsutil/examples/full.expected/failed_all_uploads.json
@ -10,7 +10,6 @@
    ],
    "name": "upload test file",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -25,7 +24,6 @@
    ],
    "name": "upload test file (attempt 2)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -40,7 +38,6 @@
    ],
    "name": "upload test file (attempt 3)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -55,7 +52,6 @@
    ],
    "name": "upload test file (attempt 4)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -70,7 +66,6 @@
    ],
    "name": "upload test file (attempt 5)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
--- a/infra/bots/recipe_modules/gsutil/examples/full.expected/failed_one_upload.json
+++ b/infra/bots/recipe_modules/gsutil/examples/full.expected/failed_one_upload.json
@ -10,7 +10,6 @@
    ],
    "name": "upload test file",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
--- a/infra/bots/recipe_modules/run/examples/full.expected/test.json
+++ b/infra/bots/recipe_modules/run/examples/full.expected/test.json
@ -9,7 +9,6 @@
    },
    "name": "fail",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -23,7 +22,6 @@
    },
    "name": "fail again",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -124,7 +122,6 @@
    },
    "name": "retry fail",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -149,7 +146,6 @@
    },
    "name": "retry fail (attempt 2)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -174,7 +170,6 @@
    },
    "name": "retry fail (attempt 3)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -199,7 +194,6 @@
    },
    "name": "retry fail (attempt 4)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -224,7 +218,6 @@
    },
    "name": "retry fail (attempt 5)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -238,7 +231,6 @@
    },
    "name": "retry success",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -263,7 +255,6 @@
    },
    "name": "retry success (attempt 2)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
--- a/infra/bots/recipes/android_compile.expected/android_compile_trybot_failure.json
+++ b/infra/bots/recipes/android_compile.expected/android_compile_trybot_failure.json
@ -14,7 +14,6 @@
    ],
    "name": "Trigger and wait for task on android compile server",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
--- a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json
+++ b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json
@ -446,7 +446,6 @@
    },
    "name": "parse lottie 3!.json trace",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_LOG_LINE@json.output@{@@@",
      "@@@STEP_LOG_LINE@json.output@  \"frame_avg_us\": 179.71, @@@",
      "@@@STEP_LOG_LINE@json.output@  \"frame_max_us\": 218.25, @@@",
--- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json
+++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json
@ -223,7 +223,6 @@
    },
    "name": "Upload SKPs",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
--- a/infra/bots/recipes/test.expected/failed_dm.json
+++ b/infra/bots/recipes/test.expected/failed_dm.json
@ -281,7 +281,6 @@
    },
    "name": "symbolized dm",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
--- a/infra/bots/recipes/test.expected/failed_get_hashes.json
+++ b/infra/bots/recipes/test.expected/failed_get_hashes.json
@ -590,7 +590,6 @@
    "infra_step": true,
    "name": "get uninteresting hashes",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_LOG_LINE@python.inline@@@@",
      "@@@STEP_LOG_LINE@python.inline@import contextlib@@@",
      "@@@STEP_LOG_LINE@python.inline@import math@@@",
--- a/infra/bots/recipes/test.expected/failed_pull.json
+++ b/infra/bots/recipes/test.expected/failed_pull.json
@ -788,7 +788,6 @@
    },
    "name": "dm",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_LOG_LINE@python.inline@@@@",
      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
@ -826,7 +825,6 @@
    "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out",
    "~followup_annotations": [
      "@@@STEP_NEST_LEVEL@1@@@",
-      "step returned non-zero exit code: 1",
      "@@@STEP_EXCEPTION@@@"
    ]
  },
@ -883,7 +881,6 @@
    "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out (attempt 2)",
    "~followup_annotations": [
      "@@@STEP_NEST_LEVEL@1@@@",
-      "step returned non-zero exit code: 1",
      "@@@STEP_EXCEPTION@@@"
    ]
  },
@ -940,7 +937,6 @@
    "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/dm_out (attempt 3)",
    "~followup_annotations": [
      "@@@STEP_NEST_LEVEL@1@@@",
-      "step returned non-zero exit code: 1",
      "@@@STEP_EXCEPTION@@@"
    ]
  },
--- a/infra/bots/recipes/test.expected/failed_push.json
+++ b/infra/bots/recipes/test.expected/failed_push.json
@ -60,7 +60,6 @@
    "infra_step": true,
    "name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_LOG_LINE@python.inline@@@@",
      "@@@STEP_LOG_LINE@python.inline@import os@@@",
      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
--- a/infra/bots/recipes/upload_dm_results.expected/failed_all.json
+++ b/infra/bots/recipes/upload_dm_results.expected/failed_all.json
@ -28,7 +28,6 @@
    ],
    "name": "upload .png images",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -42,7 +41,6 @@
    ],
    "name": "upload .png images (attempt 2)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -56,7 +54,6 @@
    ],
    "name": "upload .png images (attempt 3)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -70,7 +67,6 @@
    ],
    "name": "upload .png images (attempt 4)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
@ -84,7 +80,6 @@
    ],
    "name": "upload .png images (attempt 5)",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
--- a/infra/bots/recipes/upload_dm_results.expected/failed_once.json
+++ b/infra/bots/recipes/upload_dm_results.expected/failed_once.json
@ -28,7 +28,6 @@
    ],
    "name": "upload .png images",
    "~followup_annotations": [
-      "step returned non-zero exit code: 1",
      "@@@STEP_FAILURE@@@"
    ]
  },
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@ -14,12 +14,12 @@
  "deps": {
    "depot_tools": {
      "branch": "master",
-      "revision": "c74cce1e7a8c12695b82d25c9d24052a93325ce6",
+      "revision": "51c0f388a154eb0e3c10ce6db73ad7aa128a9238",
      "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
    },
    "recipe_engine": {
      "branch": "master",
-      "revision": "b37679d2f44240b461114360ae38e0d974f44119",
+      "revision": "5c579aefde72744956934c8805273cd43f53cd1d",
      "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
    }
  },