[recipes] Band-aid on top of a hack: pin depot_tools

Bug: skia:7050 Change-Id: I53b141bf76ab4773909df968f69ba04dc29e0dc9 Reviewed-on: https://skia-review.googlesource.com/114960 Reviewed-by: Ravi Mistry <rmistry@google.com> Commit-Queue: Eric Boren <borenet@google.com>
2018-03-19 08:10:26 -04:00 · 2018-03-19 08:10:26 -04:00 · ccbe400174
commit ccbe400174
parent fe0253f8bb
16 changed files with 16 additions and 29 deletions
--- a/infra/bots/recipe_modules/core/api.py
+++ b/infra/bots/recipe_modules/core/api.py
@ -151,7 +151,7 @@ class SkiaApi(recipe_api.RecipeApi):
        'recipes', 'recipe_modules', 'bot_update', 'resources')
      self.m.git.checkout(
          'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
-          dir_path=depot_tools, ref='master')
+          dir_path=depot_tools, ref='06493714339009216197d59c5413da2a1efdf4a2')
      def resource(r):
        return res.join(r)
      self.m.bot_update.resource = resource
--- a/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
+++ b/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json
@ -45,7 +45,6 @@
      "retry",
      "fetch",
      "origin",
-      "master",
      "--progress"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
@ -60,7 +59,7 @@
      "git",
      "checkout",
      "-f",
-      "FETCH_HEAD"
+      "06493714339009216197d59c5413da2a1efdf4a2"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
    "infra_step": true,
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json
@ -18,7 +18,6 @@
      "retry",
      "fetch",
      "origin",
-      "master",
      "--progress"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools",
@ -33,7 +32,7 @@
      "git",
      "checkout",
      "-f",
-      "FETCH_HEAD"
+      "06493714339009216197d59c5413da2a1efdf4a2"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools",
    "infra_step": true,
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json
@ -18,7 +18,6 @@
      "retry",
      "fetch",
      "origin",
-      "master",
      "--progress"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
@ -33,7 +32,7 @@
      "git",
      "checkout",
      "-f",
-      "FETCH_HEAD"
+      "06493714339009216197d59c5413da2a1efdf4a2"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
    "infra_step": true,
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json
@ -18,7 +18,6 @@
      "retry",
      "fetch",
      "origin",
-      "master",
      "--progress"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
@ -33,7 +32,7 @@
      "git",
      "checkout",
      "-f",
-      "FETCH_HEAD"
+      "06493714339009216197d59c5413da2a1efdf4a2"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
    "infra_step": true,
--- a/infra/bots/recipe_modules/flavor/flutter_flavor.py
+++ b/infra/bots/recipe_modules/flavor/flutter_flavor.py
@ -28,7 +28,7 @@ class FlutterFlavorUtils(default_flavor.DefaultFlavorUtils):
      depot_tools = self.m.vars.checkout_root.join('depot_tools')
      self.m.git.checkout(
          'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
-          dir_path=depot_tools, ref='master')
+          dir_path=depot_tools, ref='06493714339009216197d59c5413da2a1efdf4a2')
      self.m.run(
          self.m.step,
          'runhook',
--- a/infra/bots/recipe_modules/flavor/pdfium_flavor.py
+++ b/infra/bots/recipe_modules/flavor/pdfium_flavor.py
@ -24,7 +24,7 @@ class PDFiumFlavorUtils(default_flavor.DefaultFlavorUtils):
      depot_tools = self.m.vars.checkout_root.join('depot_tools')
      self.m.git.checkout(
          'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
-          dir_path=depot_tools, ref='master')
+          dir_path=depot_tools, ref='06493714339009216197d59c5413da2a1efdf4a2')
      self.m.run(
          self.m.step,
          'runhook',
--- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json
+++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json
@ -129,7 +129,6 @@
      "retry",
      "fetch",
      "origin",
-      "master",
      "--progress"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools",
@ -144,7 +143,7 @@
      "git",
      "checkout",
      "-f",
-      "FETCH_HEAD"
+      "06493714339009216197d59c5413da2a1efdf4a2"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools",
    "infra_step": true,
--- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json
+++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json
@ -129,7 +129,6 @@
      "retry",
      "fetch",
      "origin",
-      "master",
      "--progress"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
@ -144,7 +143,7 @@
      "git",
      "checkout",
      "-f",
-      "FETCH_HEAD"
+      "06493714339009216197d59c5413da2a1efdf4a2"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
    "infra_step": true,
--- a/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json
+++ b/infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json
@ -129,7 +129,6 @@
      "retry",
      "fetch",
      "origin",
-      "master",
      "--progress"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
@ -144,7 +143,7 @@
      "git",
      "checkout",
      "-f",
-      "FETCH_HEAD"
+      "06493714339009216197d59c5413da2a1efdf4a2"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
    "infra_step": true,
--- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json
+++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json
@ -45,7 +45,6 @@
      "retry",
      "fetch",
      "origin",
-      "master",
      "--progress"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
@ -60,7 +59,7 @@
      "git",
      "checkout",
      "-f",
-      "FETCH_HEAD"
+      "06493714339009216197d59c5413da2a1efdf4a2"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
    "infra_step": true,
--- a/infra/bots/recipes/compile.expected/flutter_trybot.json
+++ b/infra/bots/recipes/compile.expected/flutter_trybot.json
@ -133,7 +133,6 @@
      "retry",
      "fetch",
      "origin",
-      "master",
      "--progress"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools",
@ -148,7 +147,7 @@
      "git",
      "checkout",
      "-f",
-      "FETCH_HEAD"
+      "06493714339009216197d59c5413da2a1efdf4a2"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools",
    "infra_step": true,
--- a/infra/bots/recipes/compile.expected/pdfium_trybot.json
+++ b/infra/bots/recipes/compile.expected/pdfium_trybot.json
@ -133,7 +133,6 @@
      "retry",
      "fetch",
      "origin",
-      "master",
      "--progress"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
@ -148,7 +147,7 @@
      "git",
      "checkout",
      "-f",
-      "FETCH_HEAD"
+      "06493714339009216197d59c5413da2a1efdf4a2"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
    "infra_step": true,
--- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
+++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
@ -45,7 +45,6 @@
      "retry",
      "fetch",
      "origin",
-      "master",
      "--progress"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
@ -60,7 +59,7 @@
      "git",
      "checkout",
      "-f",
-      "FETCH_HEAD"
+      "06493714339009216197d59c5413da2a1efdf4a2"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
    "infra_step": true,
--- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
+++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
@ -45,7 +45,6 @@
      "retry",
      "fetch",
      "origin",
-      "master",
      "--progress"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
@ -60,7 +59,7 @@
      "git",
      "checkout",
      "-f",
-      "FETCH_HEAD"
+      "06493714339009216197d59c5413da2a1efdf4a2"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
    "infra_step": true,
--- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json
+++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json
@ -45,7 +45,6 @@
      "retry",
      "fetch",
      "origin",
-      "master",
      "--progress"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
@ -60,7 +59,7 @@
      "git",
      "checkout",
      "-f",
-      "FETCH_HEAD"
+      "06493714339009216197d59c5413da2a1efdf4a2"
    ],
    "cwd": "[CUSTOM_/_B_WORK]/depot_tools",
    "infra_step": true,