aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Eric Boren <borenet@google.com>2018-03-19 08:10:26 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-03-19 12:43:45 +0000
commitccbe40017466a9260e8409b9313c4852504f8d11 (patch)
tree52cdc3853cecc1cc3e7c6013e5a06545da539122
parentfe0253f8bb64857df088d5ff54e2b5b66b102b46 (diff)
[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>
-rw-r--r--infra/bots/recipe_modules/core/api.py2
-rw-r--r--infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json3
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json3
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json3
-rw-r--r--infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json3
-rw-r--r--infra/bots/recipe_modules/flavor/flutter_flavor.py2
-rw-r--r--infra/bots/recipe_modules/flavor/pdfium_flavor.py2
-rw-r--r--infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-Flutter_Android.json3
-rw-r--r--infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium.json3
-rw-r--r--infra/bots/recipes/compile.expected/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths.json3
-rw-r--r--infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json3
-rw-r--r--infra/bots/recipes/compile.expected/flutter_trybot.json3
-rw-r--r--infra/bots/recipes/compile.expected/pdfium_trybot.json3
-rw-r--r--infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json3
-rw-r--r--infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json3
-rw-r--r--infra/bots/recipes/recreate_skps.expected/failed_upload.json3
16 files changed, 16 insertions, 29 deletions
diff --git a/infra/bots/recipe_modules/core/api.py b/infra/bots/recipe_modules/core/api.py
index 8b8fa635e8..714da7a3a5 100644
--- 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
diff --git 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
index 72685214b8..5a141ac058 100644
--- 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,
diff --git 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
index 9daa792b74..e1e335f08a 100644
--- 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,
diff --git 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
index e062b77bd4..46007a1083 100644
--- 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,
diff --git 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
index 9957d0ed44..9ec8901890 100644
--- 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,
diff --git a/infra/bots/recipe_modules/flavor/flutter_flavor.py b/infra/bots/recipe_modules/flavor/flutter_flavor.py
index 6f64ab1244..ebc498edab 100644
--- 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',
diff --git a/infra/bots/recipe_modules/flavor/pdfium_flavor.py b/infra/bots/recipe_modules/flavor/pdfium_flavor.py
index d5014b3cd9..21230a8390 100644
--- 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',
diff --git 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
index bfc951a485..a1ab4819fd 100644
--- 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,
diff --git 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
index 54de43594c..9c99ec2cb1 100644
--- 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,
diff --git 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
index cc814e3df2..f75b4c9e6d 100644
--- 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,
diff --git 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
index c12bf78cf1..3082c951a3 100644
--- 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,
diff --git a/infra/bots/recipes/compile.expected/flutter_trybot.json b/infra/bots/recipes/compile.expected/flutter_trybot.json
index c03014f57d..7963e56f1a 100644
--- 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,
diff --git a/infra/bots/recipes/compile.expected/pdfium_trybot.json b/infra/bots/recipes/compile.expected/pdfium_trybot.json
index cbb8ed1df0..5816e4a574 100644
--- 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,
diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json
index c046d3eb62..de8898c36e 100644
--- 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,
diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json
index fddcb26e1e..f03b149abe 100644
--- 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,
diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json
index 22714b045d..c449898a0f 100644
--- 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,