diff options
Diffstat (limited to 'infra/bots/recipes')
9 files changed, 38 insertions, 886 deletions
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 f69793f25d..9cc8e47e89 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 @@ -114,102 +114,14 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", - "--path", - "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "--url", - "https://chromium.googlesource.com/chromium/tools/depot_tools.git" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", - "name": "git setup" - }, - { - "cmd": [ - "git", - "retry", - "fetch", - "origin", - "--progress" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" - }, - "infra_step": true, - "name": "git fetch" - }, - { - "cmd": [ - "git", - "checkout", - "-f", - "06493714339009216197d59c5413da2a1efdf4a2" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "infra_step": true, - "name": "git checkout" - }, - { - "cmd": [ - "git", - "rev-parse", - "HEAD" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "infra_step": true, - "name": "read revision", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@" - ] - }, - { - "cmd": [ - "git", - "clean", - "-f", - "-d", - "-x" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "infra_step": true, - "name": "git clean" - }, - { - "cmd": [ - "git", - "submodule", - "sync" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "infra_step": true, - "name": "submodule sync" - }, - { - "cmd": [ - "git", - "submodule", - "update", - "--init", - "--recursive" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "infra_step": true, - "name": "submodule update" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/flutter/depot_tools/gclient", + "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]/flutter/src", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "runhook" + "name": "gclient runhooks" }, { "cmd": [ 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 2dc4275ea4..2592241d42 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 @@ -114,123 +114,15 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", - "--path", - "[CUSTOM_/_B_WORK]/depot_tools", - "--url", - "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", + "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "name": "git setup" - }, - { - "cmd": [ - "git", - "retry", - "fetch", - "origin", - "--progress" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0", - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" - }, - "infra_step": true, - "name": "git fetch" - }, - { - "cmd": [ - "git", - "checkout", - "-f", - "06493714339009216197d59c5413da2a1efdf4a2" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "git checkout" - }, - { - "cmd": [ - "git", - "rev-parse", - "HEAD" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "read revision", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@" - ] - }, - { - "cmd": [ - "git", - "clean", - "-f", - "-d", - "-x" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "git clean" - }, - { - "cmd": [ - "git", - "submodule", - "sync" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "submodule sync" - }, - { - "cmd": [ - "git", - "submodule", - "update", - "--init", - "--recursive" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "submodule update" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/depot_tools/gclient", - "runhook", - "gn_linux64" - ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "DEPOT_TOOLS_UPDATE": "0", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "runhook" + "name": "gclient runhooks" }, { "cmd": [ 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 8a2383a2bc..434c6b1539 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 @@ -114,123 +114,15 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", - "--path", - "[CUSTOM_/_B_WORK]/depot_tools", - "--url", - "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", + "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "name": "git setup" - }, - { - "cmd": [ - "git", - "retry", - "fetch", - "origin", - "--progress" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0", - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" - }, - "infra_step": true, - "name": "git fetch" - }, - { - "cmd": [ - "git", - "checkout", - "-f", - "06493714339009216197d59c5413da2a1efdf4a2" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "git checkout" - }, - { - "cmd": [ - "git", - "rev-parse", - "HEAD" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "read revision", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@" - ] - }, - { - "cmd": [ - "git", - "clean", - "-f", - "-d", - "-x" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "git clean" - }, - { - "cmd": [ - "git", - "submodule", - "sync" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "submodule sync" - }, - { - "cmd": [ - "git", - "submodule", - "update", - "--init", - "--recursive" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "submodule update" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/depot_tools/gclient", - "runhook", - "gn_linux64" - ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "DEPOT_TOOLS_UPDATE": "0", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium_SkiaPaths" + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "runhook" + "name": "gclient runhooks" }, { "cmd": [ 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 d9b323a8ca..9a1bd71949 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 @@ -31,93 +31,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", - "--path", - "[CUSTOM_/_B_WORK]/depot_tools", - "--url", - "https://chromium.googlesource.com/chromium/tools/depot_tools.git" - ], - "name": "git setup" - }, - { - "cmd": [ - "git", - "retry", - "fetch", - "origin", - "--progress" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" - }, - "infra_step": true, - "name": "git fetch" - }, - { - "cmd": [ - "git", - "checkout", - "-f", - "06493714339009216197d59c5413da2a1efdf4a2" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "git checkout" - }, - { - "cmd": [ - "git", - "rev-parse", - "HEAD" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "read revision", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@" - ] - }, - { - "cmd": [ - "git", - "clean", - "-f", - "-d", - "-x" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "git clean" - }, - { - "cmd": [ - "git", - "submodule", - "sync" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "submodule sync" - }, - { - "cmd": [ - "git", - "submodule", - "update", - "--init", - "--recursive" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "submodule update" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/depot_tools/recipes/recipe_modules/bot_update/resources/bot_update.py", + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", "--patch_root", @@ -184,17 +98,16 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/depot_tools/gclient", + "python", + "-u", + "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Debug", - "CHROME_HEADLESS": "1", "DEPOT_TOOLS_UPDATE": "0", "GYP_CHROMIUM_NO_ACTION": "0", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Mac-Clang-x86_64-Debug-CommandBuffer" + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gclient runhooks" }, diff --git a/infra/bots/recipes/compile.expected/flutter_trybot.json b/infra/bots/recipes/compile.expected/flutter_trybot.json index c821fecd31..5f8cc36499 100644 --- a/infra/bots/recipes/compile.expected/flutter_trybot.json +++ b/infra/bots/recipes/compile.expected/flutter_trybot.json @@ -118,102 +118,14 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", - "--path", - "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "--url", - "https://chromium.googlesource.com/chromium/tools/depot_tools.git" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/src", - "name": "git setup" - }, - { - "cmd": [ - "git", - "retry", - "fetch", - "origin", - "--progress" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" - }, - "infra_step": true, - "name": "git fetch" - }, - { - "cmd": [ - "git", - "checkout", - "-f", - "06493714339009216197d59c5413da2a1efdf4a2" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "infra_step": true, - "name": "git checkout" - }, - { - "cmd": [ - "git", - "rev-parse", - "HEAD" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "infra_step": true, - "name": "read revision", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@" - ] - }, - { - "cmd": [ - "git", - "clean", - "-f", - "-d", - "-x" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "infra_step": true, - "name": "git clean" - }, - { - "cmd": [ - "git", - "submodule", - "sync" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "infra_step": true, - "name": "submodule sync" - }, - { - "cmd": [ - "git", - "submodule", - "update", - "--init", - "--recursive" - ], - "cwd": "[CUSTOM_/_B_WORK]/flutter/depot_tools", - "infra_step": true, - "name": "submodule update" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/flutter/depot_tools/gclient", + "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]/flutter/src", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/flutter/src/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-Flutter_Android" + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "runhook" + "name": "gclient runhooks" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/pdfium_trybot.json b/infra/bots/recipes/compile.expected/pdfium_trybot.json index 4da343c388..d4fbbcfa1b 100644 --- a/infra/bots/recipes/compile.expected/pdfium_trybot.json +++ b/infra/bots/recipes/compile.expected/pdfium_trybot.json @@ -118,123 +118,15 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", - "--path", - "[CUSTOM_/_B_WORK]/depot_tools", - "--url", - "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", + "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]/pdfium", "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "name": "git setup" - }, - { - "cmd": [ - "git", - "retry", - "fetch", - "origin", - "--progress" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0", - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" - }, - "infra_step": true, - "name": "git fetch" - }, - { - "cmd": [ - "git", - "checkout", - "-f", - "06493714339009216197d59c5413da2a1efdf4a2" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "git checkout" - }, - { - "cmd": [ - "git", - "rev-parse", - "HEAD" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "read revision", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@" - ] - }, - { - "cmd": [ - "git", - "clean", - "-f", - "-d", - "-x" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "git clean" - }, - { - "cmd": [ - "git", - "submodule", - "sync" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "submodule sync" - }, - { - "cmd": [ - "git", - "submodule", - "update", - "--init", - "--recursive" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "DEPOT_TOOLS_UPDATE": "0" - }, - "infra_step": true, - "name": "submodule update" - }, - { - "cmd": [ - "[CUSTOM_/_B_WORK]/depot_tools/gclient", - "runhook", - "gn_linux64" - ], - "cwd": "[CUSTOM_/_B_WORK]/pdfium", - "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "DEPOT_TOOLS_UPDATE": "0", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[CUSTOM_/_B_WORK]/pdfium/third_party/skia/out/Build-Debian9-GCC-x86_64-Release-PDFium" + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, - "name": "runhook" + "name": "gclient runhooks" }, { "cmd": [ 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 f3cad6b81d..ac899f285e 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 @@ -31,93 +31,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", - "--path", - "[CUSTOM_/_B_WORK]/depot_tools", - "--url", - "https://chromium.googlesource.com/chromium/tools/depot_tools.git" - ], - "name": "git setup" - }, - { - "cmd": [ - "git", - "retry", - "fetch", - "origin", - "--progress" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" - }, - "infra_step": true, - "name": "git fetch" - }, - { - "cmd": [ - "git", - "checkout", - "-f", - "06493714339009216197d59c5413da2a1efdf4a2" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "git checkout" - }, - { - "cmd": [ - "git", - "rev-parse", - "HEAD" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "read revision", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@" - ] - }, - { - "cmd": [ - "git", - "clean", - "-f", - "-d", - "-x" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "git clean" - }, - { - "cmd": [ - "git", - "submodule", - "sync" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "submodule sync" - }, - { - "cmd": [ - "git", - "submodule", - "update", - "--init", - "--recursive" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "submodule update" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/depot_tools/recipes/recipe_modules/bot_update/resources/bot_update.py", + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", "--patch_root", @@ -184,17 +98,16 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/depot_tools/gclient", + "python", + "-u", + "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "DEPOT_TOOLS_UPDATE": "0", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gclient runhooks" }, 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 dfc0b42908..74af5ca935 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -31,93 +31,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", - "--path", - "[CUSTOM_/_B_WORK]/depot_tools", - "--url", - "https://chromium.googlesource.com/chromium/tools/depot_tools.git" - ], - "name": "git setup" - }, - { - "cmd": [ - "git", - "retry", - "fetch", - "origin", - "--progress" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" - }, - "infra_step": true, - "name": "git fetch" - }, - { - "cmd": [ - "git", - "checkout", - "-f", - "06493714339009216197d59c5413da2a1efdf4a2" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "git checkout" - }, - { - "cmd": [ - "git", - "rev-parse", - "HEAD" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "read revision", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@" - ] - }, - { - "cmd": [ - "git", - "clean", - "-f", - "-d", - "-x" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "git clean" - }, - { - "cmd": [ - "git", - "submodule", - "sync" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "submodule sync" - }, - { - "cmd": [ - "git", - "submodule", - "update", - "--init", - "--recursive" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "submodule update" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/depot_tools/recipes/recipe_modules/bot_update/resources/bot_update.py", + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", "--patch_root", @@ -184,17 +98,16 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/depot_tools/gclient", + "python", + "-u", + "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "DEPOT_TOOLS_UPDATE": "0", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gclient runhooks" }, diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json index 51c84ac7d2..a8fe5b070b 100644 --- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json +++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json @@ -31,93 +31,7 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py", - "--path", - "[CUSTOM_/_B_WORK]/depot_tools", - "--url", - "https://chromium.googlesource.com/chromium/tools/depot_tools.git" - ], - "name": "git setup" - }, - { - "cmd": [ - "git", - "retry", - "fetch", - "origin", - "--progress" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>" - }, - "infra_step": true, - "name": "git fetch" - }, - { - "cmd": [ - "git", - "checkout", - "-f", - "06493714339009216197d59c5413da2a1efdf4a2" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "git checkout" - }, - { - "cmd": [ - "git", - "rev-parse", - "HEAD" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "read revision", - "stdout": "/path/to/tmp/", - "~followup_annotations": [ - "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@" - ] - }, - { - "cmd": [ - "git", - "clean", - "-f", - "-d", - "-x" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "git clean" - }, - { - "cmd": [ - "git", - "submodule", - "sync" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "submodule sync" - }, - { - "cmd": [ - "git", - "submodule", - "update", - "--init", - "--recursive" - ], - "cwd": "[CUSTOM_/_B_WORK]/depot_tools", - "infra_step": true, - "name": "submodule update" - }, - { - "cmd": [ - "python", - "-u", - "[CUSTOM_/_B_WORK]/depot_tools/recipes/recipe_modules/bot_update/resources/bot_update.py", + "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", "cache_dir = '[CUSTOM_/_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]", "--patch_root", @@ -184,17 +98,16 @@ }, { "cmd": [ - "[CUSTOM_/_B_WORK]/depot_tools/gclient", + "python", + "-u", + "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], "cwd": "[CUSTOM_/_B_WORK]", "env": { - "BUILDTYPE": "Release", - "CHROME_HEADLESS": "1", "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "DEPOT_TOOLS_UPDATE": "0", - "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "gclient runhooks" }, |