Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(252)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json

Issue 2410843002: Recipe fixes to support try jobs in task scheduler (Closed)
Patch Set: Remove unnecessary import Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json ('K') | « infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json ('k') | infra/bots/recipes/upload_dm_results.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json
diff --git a/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json
similarity index 80%
copy from infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json
copy to infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json
index 0b7c2218243d6035c50ca1fa1c770d2b0e303ddd..eb6097c5d468931d3038d8d1224a310347cc9c75 100644
--- a/infra/bots/recipes/swarm_compile.expected/recipe_with_gerrit_patch.json
+++ b/infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_rietveld.json
@@ -25,7 +25,7 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
"cache_dir = '[CUSTOM_C:\\\\_B_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]"
@@ -34,8 +34,8 @@
"env": {
"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-Trybot"
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug"
},
"name": "gclient setup"
},
@@ -43,12 +43,12 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"sync",
"--verbose",
"--with_branch_heads",
"--nohooks",
- "-j2",
+ "-j8",
"--reset",
"--force",
"--upstream",
@@ -63,8 +63,8 @@
"env": {
"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-Trybot"
+ "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"
},
"name": "gclient sync",
"~followup_annotations": [
@@ -83,7 +83,7 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
@@ -94,8 +94,8 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot"
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug"
},
"name": "gclient recurse (git config user.name)"
},
@@ -103,7 +103,7 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[depot_tools]\\gclient.py",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
@@ -114,8 +114,8 @@
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot"
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug"
},
"name": "gclient recurse (git config user.email)"
},
@@ -123,25 +123,28 @@
"cmd": [
"python",
"-u",
- "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"
+ "[DEPOT_TOOLS]/apply_issue.py",
+ "-r",
+ "[CUSTOM_C:\\_B_WORK]/skia",
+ "-i",
+ "500",
+ "-p",
+ "1",
+ "-s",
+ "https://codereview.chromium.org",
+ "--no-auth"
],
- "env": {
- "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]"
- },
- "name": "apply_gerrit"
+ "name": "apply_issue",
+ "~followup_annotations": [
+ "@@@STEP_LINK@Applied issue 500@https://codereview.chromium.org/500@@@"
+ ]
},
{
"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",
+ "[SLAVE_BUILD]/tmp",
"511"
],
"name": "makedirs tmp_dir",
@@ -160,30 +163,17 @@
},
{
"cmd": [
- "python",
- "-u",
- "[CUSTOM_C:\\_B_WORK]\\skia\\infra\\bots\\bootstrap_win_toolchain_json.py",
- "--win_toolchain_json",
- "[SLAVE_BUILD]\\src\\build\\win_toolchain.json",
- "--depot_tools_parent_dir",
- "[SLAVE_BUILD]"
- ],
- "name": "bootstrap win toolchain"
- },
- {
- "cmd": [
- "python",
- "make.py",
+ "make",
"most"
],
- "cwd": "[CUSTOM_C:\\_B_WORK]\\skia",
+ "cwd": "[CUSTOM_C:\\_B_WORK]/skia",
"env": {
"BUILDTYPE": "Debug",
"CHROME_HEADLESS": "1",
- "CHROME_PATH": "[SLAVE_BUILD]\\src",
+ "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];RECIPE_PACKAGE_REPO[depot_tools];RECIPE_PACKAGE_REPO[depot_tools]",
- "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug-Trybot"
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]:RECIPE_PACKAGE_REPO[depot_tools]",
+ "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug"
},
"name": "build most"
},
@@ -192,8 +182,8 @@
"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-Trybot\\Debug",
- "[CUSTOM_[SWARM_OUT_DIR]]\\out\\Debug"
+ "[CUSTOM_C:\\_B_WORK]/skia/out/Build-Win-MSVC-x86-Debug/Debug",
+ "[CUSTOM_[SWARM_OUT_DIR]]/out/Debug"
],
"name": "copy build products",
"~followup_annotations": [
« infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json ('K') | « infra/bots/recipes/swarm_compile.expected/buildbotless_trybot_gerrit.json ('k') | infra/bots/recipes/upload_dm_results.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698