| Index: infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json
|
| diff --git a/infra/bots/recipes/swarm_compile.expected/big_issue_number.json b/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json
|
| similarity index 84%
|
| copy from infra/bots/recipes/swarm_compile.expected/big_issue_number.json
|
| copy to infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json
|
| index 7a27e5e9f833e670fc8cfed8c3c7e0b8814beb7d..4fb085d331bc0f7e73e883246a053ea6a645a195 100644
|
| --- a/infra/bots/recipes/swarm_compile.expected/big_issue_number.json
|
| +++ b/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json
|
| @@ -35,7 +35,7 @@
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]",
|
| - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
|
| + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot"
|
| },
|
| "name": "gclient setup"
|
| },
|
| @@ -59,7 +59,7 @@
|
| "BUILDTYPE": "Debug",
|
| "CHROME_HEADLESS": "1",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
|
| - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
|
| + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot"
|
| },
|
| "name": "gclient sync",
|
| "~followup_annotations": [
|
| @@ -78,20 +78,40 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[DEPOT_TOOLS]\\apply_issue.py",
|
| - "-r",
|
| + "RECIPE_MODULE[depot_tools::bot_update]\\resources\\apply_gerrit.py",
|
| + "--gerrit_repo",
|
| + "skia",
|
| + "--gerrit_ref",
|
| + "refs/changes/00/2100/2",
|
| + "--root",
|
| "[CUSTOM_C:\\_B_WORK]\\skia",
|
| - "-i",
|
| - "2147533002",
|
| - "-p",
|
| - "1",
|
| - "-s",
|
| - "https://codereview.chromium.org",
|
| - "--no-auth"
|
| + "--gerrit_rebase_patch_ref"
|
| ],
|
| - "name": "apply_issue",
|
| + "env": {
|
| + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
|
| + },
|
| + "name": "apply_gerrit"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| + "[SLAVE_BUILD]\\tmp",
|
| + "511"
|
| + ],
|
| + "name": "makedirs tmp_dir",
|
| "~followup_annotations": [
|
| - "@@@STEP_LINK@Applied issue 2147533002@https://codereview.chromium.org/2147533002@@@"
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| ]
|
| },
|
| {
|
| @@ -119,7 +139,7 @@
|
| "CHROME_PATH": "[SLAVE_BUILD]\\src",
|
| "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_warnings_as_errors=1 skia_win_debuggers_path=c:/DbgHelp skia_win_ltcg=0",
|
| "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
|
| - "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug"
|
| + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot"
|
| },
|
| "name": "build most"
|
| },
|
| @@ -128,7 +148,7 @@
|
| "python",
|
| "-u",
|
| "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products_whitelist = ['dm', 'dm.exe', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'lib/*.so', 'iOSShell.app', 'iOSShell.ipa', 'visualbench', 'visualbench.exe', 'vulkan-1.dll']\n\ntry:\n os.makedirs(dst)\nexcept OSError as e:\n if e.errno != errno.EEXIST:\n raise\n\nfor pattern in build_products_whitelist:\n path = os.path.join(src, pattern)\n for f in glob.glob(path):\n dst_path = os.path.join(dst, os.path.relpath(f, src))\n if not os.path.isdir(os.path.dirname(dst_path)):\n os.makedirs(os.path.dirname(dst_path))\n print 'Copying build product %s to %s' % (f, dst_path)\n shutil.move(f, dst_path)\n",
|
| - "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug\\Debug",
|
| + "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot\\Debug",
|
| "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Debug"
|
| ],
|
| "name": "copy build products",
|
|
|