diff options
| author |  Ben Wagner <benjaminwagner@google.com> | 2018-04-26 18:19:25 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-26 22:21:04 +0000 |
| commit | 01d3eb64e7b11b22cf206758f01b06a7ae0bbb20 (patch) | |
| tree | 2c53c65e62df6387cf77b1a33a447a47024e1b3f /infra/bots/recipes/recreate_skps.expected/failed_upload.json | |
| parent | bf134d2283570786984f2c1630abbbc2c2e1bf09 (diff) | |
Revert "[recipes] Use named caches for git and workdirs"
This reverts commit e8615f969e92009551b70c85d1913202390e0b0d.
Reason for revert: Causing CommandBuffer builds to time out
Original change's description:
> [recipes] Use named caches for git and workdirs
>
> Bug: skia:
> Change-Id: Iaf3d190252c9483c8b9e58a3ab0305db4173cc1c
> Reviewed-on: https://skia-review.googlesource.com/123929
> Commit-Queue: Eric Boren <borenet@google.com>
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
----------------
Revert "[infra] Fix missing cache for Bookmaker"
This reverts commit d19f039a16cc4ed29dc6f0ef7100125819ca291d.
Reason for revert: Need to revert https://skia-review.googlesource.com/123929
Original change's description:
> [infra] Fix missing cache for Bookmaker
>
> Bug: skia:
> Change-Id: I12d42fa1bb364ea6c75865f72143daf92b8c12c3
> Reviewed-on: https://skia-review.googlesource.com/124052
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Eric Boren <borenet@google.com>
----------------
Revert "Fix missing/duplicate named caches"
This reverts commit 0820a6fb697be598b41b65c7645659e216b30bc5.
Reason for revert: Need to revert https://skia-review.googlesource.com/123929
Original change's description:
> Fix missing/duplicate named caches
>
> Fixes issue with https://skia-review.googlesource.com/c/skia/+/123929
>
> No-Try: true
> Change-Id: I582b2bba67b8b257f35c5b85ccfe6e6304ff7a7c
> Reviewed-on: https://skia-review.googlesource.com/124180
> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
> Auto-Submit: Ben Wagner <benjaminwagner@google.com>
> Reviewed-by: Ravi Mistry <rmistry@google.com>
----------------
TBR=borenet@google.com,benjaminwagner@google.com,rmistry@google.com
Change-Id: Id8443ad9dc50f018251a6b6892b06fe256e6c578
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/124203
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra/bots/recipes/recreate_skps.expected/failed_upload.json')
| -rw-r--r-- | infra/bots/recipes/recreate_skps.expected/failed_upload.json | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json index d839cf0d6f..a8fe5b070b 100644 --- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json +++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json @@ -9,7 +9,7 @@ "ensure-directory", "--mode", "0777", - "[START_DIR]/cache/work" + "[CUSTOM_/_B_WORK]" ], "infra_step": true, "name": "makedirs checkout_path" @@ -22,10 +22,10 @@ "--json-output", "/path/to/tmp/json", "remove", - "[START_DIR]/cache/work/.gclient_entries" + "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [START_DIR]/cache/work/.gclient_entries" + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -33,13 +33,13 @@ "-u", "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py", "--spec-path", - "cache_dir = '[START_DIR]/cache/git'\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'}]", + "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", "skia", "--revision_mapping_file", "{\"got_revision\": \"skia\"}", "--git-cache-dir", - "[START_DIR]/cache/git", + "[CUSTOM_/_B_CACHE]", "--cleanup-dir", "[CLEANUP]/bot_update", "--output_json", @@ -49,7 +49,7 @@ "--revision", "src@origin/lkcr" ], - "cwd": "[START_DIR]/cache/work", + "cwd": "[CUSTOM_/_B_WORK]", "env_prefixes": { "PATH": [ "RECIPE_PACKAGE_REPO[depot_tools]" @@ -103,7 +103,7 @@ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py", "runhooks" ], - "cwd": "[START_DIR]/cache/work", + "cwd": "[CUSTOM_/_B_WORK]", "env": { "CPPFLAGS": "-DSK_ALLOW_CROSSPROCESS_PICTUREIMAGEFILTERS=1", "DEPOT_TOOLS_UPDATE": "0", @@ -128,11 +128,11 @@ }, { "cmd": [ - "[START_DIR]/cache/work/src/buildtools/linux64/gn", + "[CUSTOM_/_B_WORK]/src/buildtools/linux64/gn", "gen", - "[START_DIR]/cache/work/src/out/Release" + "[CUSTOM_/_B_WORK]/src/out/Release" ], - "cwd": "[START_DIR]/cache/work/src", + "cwd": "[CUSTOM_/_B_WORK]/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -147,10 +147,10 @@ "cmd": [ "ninja", "-C", - "[START_DIR]/cache/work/src/out/Release", + "[CUSTOM_/_B_WORK]/src/out/Release", "chrome" ], - "cwd": "[START_DIR]/cache/work/src", + "cwd": "[CUSTOM_/_B_WORK]/src", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -190,15 +190,15 @@ { "cmd": [ "python", - "[START_DIR]/cache/work/skia/infra/bots/assets/skp/create.py", + "[CUSTOM_/_B_WORK]/skia/infra/bots/assets/skp/create.py", "--chrome_src_path", - "[START_DIR]/cache/work/src", + "[CUSTOM_/_B_WORK]/src", "--browser_executable", - "[START_DIR]/cache/work/src/out/Release/chrome", + "[CUSTOM_/_B_WORK]/src/out/Release/chrome", "--target_dir", "[START_DIR]/skp_output" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", @@ -258,11 +258,11 @@ { "cmd": [ "python", - "[START_DIR]/cache/work/skia/infra/bots/upload_skps.py", + "[CUSTOM_/_B_WORK]/skia/infra/bots/upload_skps.py", "--target_dir", "[START_DIR]/skp_output" ], - "cwd": "[START_DIR]/cache/work/skia", + "cwd": "[CUSTOM_/_B_WORK]/skia", "env": { "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", |