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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json

Issue 1919193002: build: roll infra_paths changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: merge 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-Debug-Swarming.json ('k') | scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win8-MSVC-x86_64-Release-Swarming.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-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json
index 9d2c3aa348981093a258469102d20582e6486310..9ac2c33b47c7bce10bfe989561332d9275cc3af0 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot.json
@@ -7,7 +7,7 @@
"origin",
"https://skia.googlesource.com/skia.git"
],
- "cwd": "[SLAVE_BUILD]/skia",
+ "cwd": "[CWD]/skia",
"name": "git remote set-url"
},
{
@@ -15,7 +15,7 @@
"git",
"fetch"
],
- "cwd": "[SLAVE_BUILD]/skia",
+ "cwd": "[CWD]/skia",
"name": "git fetch"
},
{
@@ -25,7 +25,7 @@
"--hard",
"abc123"
],
- "cwd": "[SLAVE_BUILD]/skia",
+ "cwd": "[CWD]/skia",
"name": "git reset"
},
{
@@ -35,7 +35,7 @@
"-d",
"-f"
],
- "cwd": "[SLAVE_BUILD]/skia",
+ "cwd": "[CWD]/skia",
"name": "git clean"
},
{
@@ -47,7 +47,6 @@
"--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]"
},
@@ -57,11 +56,10 @@
"cmd": [
"python",
"-u",
- "[BUILD]/scripts/slave/gclient_safe_revert.py",
+ "[ROOT]/b/build/scripts/slave/gclient_safe_revert.py",
".",
- "[DEPOT_TOOLS]/gclient"
+ "[ROOT]/b/depot_tools/gclient"
],
- "cwd": "[SLAVE_BUILD]",
"name": "gclient revert"
},
{
@@ -79,7 +77,6 @@
"--output-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -100,9 +97,9 @@
"cmd": [
"python",
"-u",
- "[DEPOT_TOOLS]/apply_issue.py",
+ "[ROOT]/b/depot_tools/apply_issue.py",
"-r",
- "[SLAVE_BUILD]/skia",
+ "[CWD]/skia",
"-i",
"500",
"-p",
@@ -111,7 +108,6 @@
"https://codereview.chromium.org",
"--no-auth"
],
- "cwd": "[SLAVE_BUILD]",
"name": "apply_issue",
"~followup_annotations": [
"@@@STEP_LINK@Applied issue 500@https://codereview.chromium.org/500@@@"
@@ -121,11 +117,11 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
+ "[CWD]/skia/tools/buildbot_spec.py",
"/path/to/tmp/json",
"Build-Ubuntu-GCC-x86_64-Release-Swarming-Trybot"
],
- "cwd": "[SLAVE_BUILD]/skia",
+ "cwd": "[CWD]/skia",
"name": "exec buildbot_spec.py",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -165,11 +161,10 @@
"-u",
"RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
"--path",
- "[SLAVE_BUILD]/swarming.client",
+ "[CWD]/swarming.client",
"--url",
"https://chromium.googlesource.com/external/swarming.client.git"
],
- "cwd": "[SLAVE_BUILD]",
"name": "git setup (swarming_client)"
},
{
@@ -180,7 +175,7 @@
"origin",
"master"
],
- "cwd": "[SLAVE_BUILD]/swarming.client",
+ "cwd": "[CWD]/swarming.client",
"name": "git fetch (swarming_client)"
},
{
@@ -190,7 +185,7 @@
"-f",
"FETCH_HEAD"
],
- "cwd": "[SLAVE_BUILD]/swarming.client",
+ "cwd": "[CWD]/swarming.client",
"name": "git checkout (swarming_client)"
},
{
@@ -199,7 +194,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[SLAVE_BUILD]/swarming.client",
+ "cwd": "[CWD]/swarming.client",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -214,7 +209,7 @@
"-d",
"-x"
],
- "cwd": "[SLAVE_BUILD]/swarming.client",
+ "cwd": "[CWD]/swarming.client",
"name": "git clean (swarming_client)"
},
{
@@ -223,7 +218,7 @@
"submodule",
"sync"
],
- "cwd": "[SLAVE_BUILD]/swarming.client",
+ "cwd": "[CWD]/swarming.client",
"name": "submodule sync (swarming_client)"
},
{
@@ -234,17 +229,16 @@
"--init",
"--recursive"
],
- "cwd": "[SLAVE_BUILD]/swarming.client",
+ "cwd": "[CWD]/swarming.client",
"name": "submodule update (swarming_client)"
},
{
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/swarming.client/swarming.py",
+ "[CWD]/swarming.client/swarming.py",
"--version"
],
- "cwd": "[SLAVE_BUILD]",
"name": "swarming.py --version",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -260,9 +254,8 @@
"--bucket",
"chromium-luci",
"-d",
- "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
+ "[CWD]/skia/infra/bots/tools/luci-go/linux64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "download luci-go linux"
},
{
@@ -274,9 +267,8 @@
"--bucket",
"chromium-luci",
"-d",
- "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
+ "[CWD]/skia/infra/bots/tools/luci-go/mac64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "download luci-go mac"
},
{
@@ -288,9 +280,8 @@
"--bucket",
"chromium-luci",
"-d",
- "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
+ "[CWD]/skia/infra/bots/tools/luci-go/win64"
],
- "cwd": "[SLAVE_BUILD]",
"name": "download luci-go win"
},
{
@@ -298,9 +289,8 @@
"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",
- "[SLAVE_BUILD]/luci-go"
+ "[CWD]/luci-go"
],
- "cwd": "[SLAVE_BUILD]",
"name": "rmtree Go binary dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -318,11 +308,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
- "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go",
- "[SLAVE_BUILD]/luci-go",
+ "[CWD]/skia/infra/bots/tools/luci-go",
+ "[CWD]/luci-go",
"0"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Copy Go binary"
},
{
@@ -330,10 +319,9 @@
"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",
- "[BUILD]/third_party/infra",
+ "[ROOT]/b/build/third_party/infra",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs third_party_infra",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -353,10 +341,9 @@
"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]/swarming_temp_dir",
+ "[CWD]/swarming_temp_dir",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -376,10 +363,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "{\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"
+ "{\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"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Write isolate_recipes.isolated.gen.json"
},
{
@@ -387,16 +373,15 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[SLAVE_BUILD]/swarming.client",
+ "[CWD]/swarming.client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[SLAVE_BUILD]/swarming_temp_dir/isolate_recipes.isolated.gen.json"
+ "[CWD]/swarming_temp_dir/isolate_recipes.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -411,10 +396,9 @@
"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]/swarming_temp_dir",
+ "[CWD]/swarming_temp_dir",
"511"
],
- "cwd": "[SLAVE_BUILD]",
"name": "makedirs swarming tmp dir (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -434,10 +418,9 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "{\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 \"Ubuntu\", \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"
+ "{\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 \"Ubuntu\", \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"
],
- "cwd": "[SLAVE_BUILD]",
"name": "Write compile_skia.isolated.gen.json"
},
{
@@ -445,16 +428,15 @@
"python",
"-u",
"RECIPE_MODULE[build::isolate]/resources/isolate.py",
- "[SLAVE_BUILD]/swarming.client",
+ "[CWD]/swarming.client",
"batcharchive",
"--dump-json",
"/path/to/tmp/json",
"--isolate-server",
"https://isolateserver.appspot.com",
"--verbose",
- "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
+ "[CWD]/swarming_temp_dir/compile_skia.isolated.gen.json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "isolate tests (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -469,10 +451,9 @@
"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",
- "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated",
+ "[CWD]/swarming_temp_dir/skia-task-compile_skia.isolated",
"[dummy hash for isolate_recipes]"
],
- "cwd": "[SLAVE_BUILD]",
"name": "add_isolated_input",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -491,13 +472,12 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/swarming.client/isolateserver.py",
+ "[CWD]/swarming.client/isolateserver.py",
"archive",
"--isolate-server",
"https://isolateserver.appspot.com",
- "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated"
+ "[CWD]/swarming_temp_dir/skia-task-compile_skia.isolated"
],
- "cwd": "[SLAVE_BUILD]",
"name": "upload new .isolated file for compile_skia",
"stdout": "/path/to/tmp/"
},
@@ -505,7 +485,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/swarming.client/swarming.py",
+ "[CWD]/swarming.client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -569,7 +549,6 @@
"issue=500",
"revision=164710"
],
- "cwd": "[SLAVE_BUILD]",
"name": "[trigger] compile_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -590,7 +569,7 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/swarming.client/swarming.py",
+ "[CWD]/swarming.client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -602,7 +581,6 @@
"--task-summary-json",
"/path/to/tmp/json"
],
- "cwd": "[SLAVE_BUILD]",
"name": "compile_skia on Ubuntu",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
« no previous file with comments | « scripts/slave/recipes/skia/swarm_trigger.expected/Build-Ubuntu-GCC-x86_64-Debug-Swarming.json ('k') | scripts/slave/recipes/skia/swarm_trigger.expected/Build-Win8-MSVC-x86_64-Release-Swarming.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698