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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/ct_skps.expected/CT_DM_10k_SKPs.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/ct_skps.expected/CT_BENCH_10k_SKPs.json ('k') | scripts/slave/recipes/skia/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/ct_skps.expected/CT_DM_10k_SKPs.json
diff --git a/scripts/slave/recipes/skia/ct_skps.expected/CT_DM_10k_SKPs.json b/scripts/slave/recipes/skia/ct_skps.expected/CT_DM_10k_SKPs.json
index 32eacce496ac5661a1c8776aa0e9f1f52a2427df..6eebf8d896146bfe8d69a35eae62513c4fccb0a1 100644
--- a/scripts/slave/recipes/skia/ct_skps.expected/CT_DM_10k_SKPs.json
+++ b/scripts/slave/recipes/skia/ct_skps.expected/CT_DM_10k_SKPs.json
@@ -6,8 +6,9 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
- "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}, {'deps_file': 'DEPS', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -30,6 +31,7 @@
"--output-json",
"/path/to/tmp/json"
],
+ "cwd": "[SLAVE_BUILD]",
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -55,10 +57,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)"
},
{
@@ -69,7 +72,7 @@
"origin",
"master"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "git fetch (swarming_client)"
},
{
@@ -79,7 +82,7 @@
"-f",
"FETCH_HEAD"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "git checkout (swarming_client)"
},
{
@@ -88,7 +91,7 @@
"rev-parse",
"HEAD"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "read revision",
"stdout": "/path/to/tmp/",
"~followup_annotations": [
@@ -103,7 +106,7 @@
"-d",
"-x"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "git clean (swarming_client)"
},
{
@@ -112,7 +115,7 @@
"submodule",
"sync"
],
- "cwd": "[CWD]/swarming.client",
+ "cwd": "[SLAVE_BUILD]/swarming.client",
"name": "submodule sync (swarming_client)"
},
{
@@ -123,16 +126,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": [
@@ -148,8 +152,9 @@
"--bucket",
"chromium-luci",
"-d",
- "[CWD]/src/tools/luci-go/linux64"
+ "[SLAVE_BUILD]/src/tools/luci-go/linux64"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "download luci-go linux"
},
{
@@ -161,8 +166,9 @@
"--bucket",
"chromium-luci",
"-d",
- "[CWD]/src/tools/luci-go/mac64"
+ "[SLAVE_BUILD]/src/tools/luci-go/mac64"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "download luci-go mac"
},
{
@@ -174,8 +180,9 @@
"--bucket",
"chromium-luci",
"-d",
- "[CWD]/src/tools/luci-go/win64"
+ "[SLAVE_BUILD]/src/tools/luci-go/win64"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "download luci-go win"
},
{
@@ -183,8 +190,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@@@@",
@@ -202,10 +210,11 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
- "[CWD]/src/tools/luci-go",
- "[CWD]/luci-go",
+ "[SLAVE_BUILD]/src/tools/luci-go",
+ "[SLAVE_BUILD]/luci-go",
"0"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Copy Go binary"
},
{
@@ -214,7 +223,7 @@
"dm",
"BUILDTYPE=Debug"
],
- "cwd": "[CWD]/skia",
+ "cwd": "[SLAVE_BUILD]/skia",
"name": "build dm",
"~followup_annotations": [
"@@@SET_BUILD_PROPERTY@Location of SKPs@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/skps/All/57259e0-05dcb4c/\"@@@"
@@ -225,8 +234,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]/swarming_temp_dir"
+ "[SLAVE_BUILD]/swarming_temp_dir"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "rmtree swarming temp dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -244,9 +254,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]/skps/slave1",
+ "[SLAVE_BUILD]/skps/slave1",
"511"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "makedirs SKPs dir",
"~followup_annotations": [
"@@@STEP_LOG_LINE@python.inline@@@@",
@@ -267,15 +278,16 @@
"-u",
"RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
"--",
- "[ROOT]/b/depot_tools/gsutil.py",
+ "[DEPOT_TOOLS]/gsutil.py",
"----",
"-m",
"rsync",
"-d",
"-r",
"gs://cluster-telemetry/skps/All/57259e0-05dcb4c/slave1",
- "[CWD]/skps/slave1"
+ "[SLAVE_BUILD]/skps/slave1"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "gsutil rsync"
},
{
@@ -283,9 +295,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@@@@",
@@ -305,9 +318,10 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "{\n \"args\": [\n \"--isolate\", \n \"[CWD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[CWD]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CWD]/src/chrome\", \n \"version\": 1\n}",
- "[CWD]/swarming_temp_dir/ct-dm-1.isolated.gen.json"
+ "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}",
+ "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "Write ct-dm-1.isolated.gen.json"
},
{
@@ -315,15 +329,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/ct-dm-1.isolated.gen.json"
+ "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-1.isolated.gen.json"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "isolate tests",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -337,7 +352,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/swarming.py",
+ "[SLAVE_BUILD]/swarming.client/swarming.py",
"trigger",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -378,6 +393,7 @@
"stepname:ct-dm-1 on Ubuntu-14.04",
"[dummy hash for ct-dm-1]"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "[trigger] ct-dm-1 on Ubuntu-14.04",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -398,7 +414,7 @@
"cmd": [
"python",
"-u",
- "[CWD]/swarming.client/swarming.py",
+ "[SLAVE_BUILD]/swarming.client/swarming.py",
"collect",
"--swarming",
"https://chromium-swarm.appspot.com",
@@ -410,8 +426,9 @@
"--task-summary-json",
"/path/to/tmp/json",
"--task-output-dir",
- "[CWD]/swarming_temp_dir/outputs/ct-dm-1"
+ "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-1"
],
+ "cwd": "[SLAVE_BUILD]",
"name": "ct-dm-1 on Ubuntu-14.04",
"~followup_annotations": [
"@@@STEP_TEXT@swarming pending 71s@@@",
« no previous file with comments | « scripts/slave/recipes/skia/ct_skps.expected/CT_BENCH_10k_SKPs.json ('k') | scripts/slave/recipes/skia/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698