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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win8-MSVC-x86_64-Release-Swarming.json

Issue 1917243002: Revert "build: roll infra_paths changes" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 8 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
« no previous file with comments | « scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json ('k') | scripts/slave/recipes/skia/swarm_trigger.expected/No_downloaded_SKP_VERSION.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win8-MSVC-x86_64-Release-Swarming.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win8-MSVC-x86_64-Release-Swarming.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win8-MSVC-x86_64-Release-Swarming.json
index a6a9cf1b015abaf260680a903e1f8d0dbee0a823..967b79f417bddb86354e5cf3aab13d2d08d4f231 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win8-MSVC-x86_64-Release-Swarming.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win8-MSVC-x86_64-Release-Swarming.json
@@ -7,7 +7,7 @@
"origin",
"https://skia.googlesource.com/skia.git"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "git remote set-url"
},
{
@@ -15,7 +15,7 @@
"git",
"fetch"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "git fetch"
},
{
@@ -25,7 +25,7 @@
"--hard",
"abc123"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "git reset"
},
{
@@ -35,7 +35,7 @@
"-d",
"-f"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "git clean"
},
{
@@ -47,6 +47,7 @@
"--spec",
"cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -67,6 +68,7 @@
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -87,11 +89,11 @@
"cmd": [
"python",
"-u",
- "[CWD]/skia/tools/buildbot_spec.py",
+ "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
"/path/to/tmp/json",
"Build-Win8-MSVC-x86_64-Release-Swarming"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "exec buildbot_spec.py",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -131,10 +133,11 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
- "[CWD]/swarming.client",
+ "[SLAVE_BUILD]/swarming.client",
"--url",
"https://chromium.googlesource.com/external/swarming.client.git"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "git setup (swarming_client)"
},
{
@@ -145,7 +148,7 @@
"origin",
"master"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "git fetch (swarming_client)"
},
{
@@ -155,7 +158,7 @@
"-f",
"FETCH_HEAD"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "git checkout (swarming_client)"
},
{
@@ -164,7 +167,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -179,7 +182,7 @@
"-d",
"-x"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "git clean (swarming_client)"
},
{
@@ -188,7 +191,7 @@
"submodule",
"sync"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "submodule sync (swarming_client)"
},
{
@@ -199,16 +202,17 @@
"--init",
"--recursive"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "submodule update (swarming_client)"
},
{
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/swarming.py",
+ "[SLAVE_BUILD]/swarming.client/swarming.py",
"--version"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -224,8 +228,9 @@
"--bucket",
"chromium-luci",
"-d",
- "[CWD]/skia/infra/bots/tools/luci-go/linux64"
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "download luci-go linux"
},
{
@@ -237,8 +242,9 @@
"--bucket",
"chromium-luci",
"-d",
- "[CWD]/skia/infra/bots/tools/luci-go/mac64"
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "download luci-go mac"
},
{
@@ -250,8 +256,9 @@
"--bucket",
"chromium-luci",
"-d",
- "[CWD]/skia/infra/bots/tools/luci-go/win64"
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "download luci-go win"
},
{
@@ -259,8 +266,9 @@
"python",
"-u",
"\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
- "[CWD]/luci-go"
+ "[SLAVE_BUILD]/luci-go"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree Go binary dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -278,10 +286,11 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
- "[CWD]/skia/infra/bots/tools/luci-go",
- "[CWD]/luci-go",
+ "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go",
+ "[SLAVE_BUILD]/luci-go",
"0"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Copy Go binary"
},
{
@@ -289,9 +298,10 @@
"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",
- "[ROOT]/b/build/third_party/infra",
+ "[BUILD]/third_party/infra",
"511"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "makedirs third_party_infra",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -311,9 +321,10 @@
"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",
- "[CWD]/swarming_temp_dir",
+ "[SLAVE_BUILD]/swarming_temp_dir",
"511"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -333,9 +344,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "{\n \"args\": [\n \"--isolate\", \n \"[ROOT]/b/build/scripts/slave/recipes/skia/swarm_recipe.isolate\", \n \"--isolated\", \n \"[CWD]/swarming_temp_dir/skia-task-isolate_recipes.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\"\n ], \n \"dir\": \"[ROOT]/b/build/scripts/slave/recipes/skia\", \n \"version\": 1\n}",
- "[CWD]/swarming_temp_dir/isolate_recipes.isolated.gen.json"
+ "{\n \"args\": [\n \"--isolate\", \n \"[BUILD]/scripts/slave/recipes/skia/swarm_recipe.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-isolate_recipes.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\"\n ], \n \"dir\": \"[BUILD]/scripts/slave/recipes/skia\", \n \"version\": 1\n}",
+ "[SLAVE_BUILD]/swarming_temp_dir/isolate_recipes.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Write isolate_recipes.isolated.gen.json"
},
{
@@ -343,15 +355,16 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[CWD]/swarming.client",
+ "[SLAVE_BUILD]/swarming.client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[CWD]/swarming_temp_dir/isolate_recipes.isolated.gen.json"
+ "[SLAVE_BUILD]/swarming_temp_dir/isolate_recipes.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -366,9 +379,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[CWD]/skia/infra/bots/win_toolchain_hash.json",
+ "[SLAVE_BUILD]/skia/infra/bots/win_toolchain_hash.json",
"/path/to/tmp/"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Read win_toolchain_hash.json"
},
{
@@ -376,9 +390,10 @@
"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",
- "[CWD]/swarming_temp_dir",
+ "[SLAVE_BUILD]/swarming_temp_dir",
"511"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -398,9 +413,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "{\n \"args\": [\n \"--isolate\", \n \"[CWD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[CWD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[CWD]\", \n \"--extra-variable\", \n \"BUILD\", \n \"[ROOT]/b/build\"\n ], \n \"dir\": \"[CWD]\", \n \"version\": 1\n}",
- "[CWD]/swarming_temp_dir/compile_skia.isolated.gen.json"
+ "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Windows\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\", \n \"--extra-variable\", \n \"BUILD\", \n \"[BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
+ "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Write compile_skia.isolated.gen.json"
},
{
@@ -408,15 +424,16 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[CWD]/swarming.client",
+ "[SLAVE_BUILD]/swarming.client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[CWD]/swarming_temp_dir/compile_skia.isolated.gen.json"
+ "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "isolate tests (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -431,10 +448,11 @@
"python",
"-u",
"\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n isolated = json.load(f)\nfor h in sys.argv[2:]:\n isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n json.dump(isolated, f, sort_keys=True)\n",
- "[CWD]/swarming_temp_dir/skia-task-compile_skia.isolated",
+ "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated",
"[dummy hash for isolate_recipes]",
"705384d88f80da637eb367e5acc6f315c0e1db2f"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "add_isolated_input",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -453,12 +471,13 @@
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/isolateserver.py",
+ "[SLAVE_BUILD]/swarming.client/isolateserver.py",
"archive",
"--isolate-server",
"https://isolateserver.appspot.com",
- "[CWD]/swarming_temp_dir/skia-task-compile_skia.isolated"
+ "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "upload new .isolated file for compile_skia",
"stdout": "/path/to/tmp/"
},
@@ -466,7 +485,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/swarming.py",
+ "[SLAVE_BUILD]/swarming.client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -525,6 +544,7 @@
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=164710"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[trigger] compile_skia on Windows",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -545,7 +565,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/swarming.py",
+ "[SLAVE_BUILD]/swarming.client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -557,6 +577,7 @@
"--task-summary-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "compile_skia on Windows",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
« no previous file with comments | « scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json ('k') | scripts/slave/recipes/skia/swarm_trigger.expected/No_downloaded_SKP_VERSION.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698