| Index: scripts/slave/recipes/skia/ct_skps.expected/CT_BENCH_10k_SKPs.json
|
| diff --git a/scripts/slave/recipes/skia/ct_skps.expected/CT_BENCH_10k_SKPs.json b/scripts/slave/recipes/skia/ct_skps.expected/CT_BENCH_10k_SKPs.json
|
| index 3edfd387961735007161ece66a9548a201add6ff..362ce49ec63aa8f4f3a9f09bbe19c3ec70b674fb 100644
|
| --- a/scripts/slave/recipes/skia/ct_skps.expected/CT_BENCH_10k_SKPs.json
|
| +++ b/scripts/slave/recipes/skia/ct_skps.expected/CT_BENCH_10k_SKPs.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"
|
| },
|
| {
|
| @@ -46,7 +46,7 @@
|
| "origin",
|
| "https://chromium.googlesource.com/chromium/src.git"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[CWD]/src",
|
| "name": "git remote set-url (2)"
|
| },
|
| {
|
| @@ -54,7 +54,7 @@
|
| "git",
|
| "fetch"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[CWD]/src",
|
| "name": "git fetch (2)"
|
| },
|
| {
|
| @@ -64,7 +64,7 @@
|
| "--hard",
|
| "origin/master"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[CWD]/src",
|
| "name": "git reset (2)"
|
| },
|
| {
|
| @@ -74,7 +74,7 @@
|
| "-d",
|
| "-f"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/src",
|
| + "cwd": "[CWD]/src",
|
| "name": "git clean (2)"
|
| },
|
| {
|
| @@ -84,9 +84,8 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "config",
|
| "--spec",
|
| - "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'}]"
|
| + "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'}]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -109,7 +108,6 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -135,11 +133,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)"
|
| },
|
| {
|
| @@ -150,7 +147,7 @@
|
| "origin",
|
| "master"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "cwd": "[CWD]/swarming.client",
|
| "name": "git fetch (swarming_client)"
|
| },
|
| {
|
| @@ -160,7 +157,7 @@
|
| "-f",
|
| "FETCH_HEAD"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "cwd": "[CWD]/swarming.client",
|
| "name": "git checkout (swarming_client)"
|
| },
|
| {
|
| @@ -169,7 +166,7 @@
|
| "rev-parse",
|
| "HEAD"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "cwd": "[CWD]/swarming.client",
|
| "name": "read revision",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -184,7 +181,7 @@
|
| "-d",
|
| "-x"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "cwd": "[CWD]/swarming.client",
|
| "name": "git clean (swarming_client)"
|
| },
|
| {
|
| @@ -193,7 +190,7 @@
|
| "submodule",
|
| "sync"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "cwd": "[CWD]/swarming.client",
|
| "name": "submodule sync (swarming_client)"
|
| },
|
| {
|
| @@ -204,17 +201,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": [
|
| @@ -230,9 +226,8 @@
|
| "--bucket",
|
| "chromium-luci",
|
| "-d",
|
| - "[SLAVE_BUILD]/src/tools/luci-go/linux64"
|
| + "[CWD]/src/tools/luci-go/linux64"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "download luci-go linux"
|
| },
|
| {
|
| @@ -244,9 +239,8 @@
|
| "--bucket",
|
| "chromium-luci",
|
| "-d",
|
| - "[SLAVE_BUILD]/src/tools/luci-go/mac64"
|
| + "[CWD]/src/tools/luci-go/mac64"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "download luci-go mac"
|
| },
|
| {
|
| @@ -258,9 +252,8 @@
|
| "--bucket",
|
| "chromium-luci",
|
| "-d",
|
| - "[SLAVE_BUILD]/src/tools/luci-go/win64"
|
| + "[CWD]/src/tools/luci-go/win64"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "download luci-go win"
|
| },
|
| {
|
| @@ -268,9 +261,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@@@@",
|
| @@ -288,11 +280,10 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n",
|
| - "[SLAVE_BUILD]/src/tools/luci-go",
|
| - "[SLAVE_BUILD]/luci-go",
|
| + "[CWD]/src/tools/luci-go",
|
| + "[CWD]/luci-go",
|
| "0"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Copy Go binary"
|
| },
|
| {
|
| @@ -301,7 +292,7 @@
|
| "nanobench",
|
| "BUILDTYPE=Release"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/skia",
|
| "name": "build nanobench",
|
| "~followup_annotations": [
|
| "@@@SET_BUILD_PROPERTY@Location of SKPs@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/skps/10k/57259e0-05dcb4c/\"@@@"
|
| @@ -312,9 +303,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]/swarming_temp_dir"
|
| + "[CWD]/swarming_temp_dir"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree swarming temp dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -332,10 +322,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]/skps/slave1",
|
| + "[CWD]/skps/slave1",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs SKPs dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -356,16 +345,15 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "-m",
|
| "rsync",
|
| "-d",
|
| "-r",
|
| "gs://cluster-telemetry/skps/10k/57259e0-05dcb4c/slave1",
|
| - "[SLAVE_BUILD]/skps/slave1"
|
| + "[CWD]/skps/slave1"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil rsync"
|
| },
|
| {
|
| @@ -373,10 +361,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@@@@",
|
| @@ -396,10 +383,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json"
|
| + "{\n \"args\": [\n \"--isolate\", \n \"[CWD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[CWD]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CWD]/src/chrome\", \n \"version\": 1\n}",
|
| + "[CWD]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write ct-nanobench-1.isolated.gen.json"
|
| },
|
| {
|
| @@ -407,10 +393,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]/skps/slave2",
|
| + "[CWD]/skps/slave2",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs SKPs dir (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -431,16 +416,15 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "-m",
|
| "rsync",
|
| "-d",
|
| "-r",
|
| "gs://cluster-telemetry/skps/10k/57259e0-05dcb4c/slave2",
|
| - "[SLAVE_BUILD]/skps/slave2"
|
| + "[CWD]/skps/slave2"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil rsync (2)"
|
| },
|
| {
|
| @@ -448,10 +432,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@@@@",
|
| @@ -471,10 +454,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json"
|
| + "{\n \"args\": [\n \"--isolate\", \n \"[CWD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[CWD]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CWD]/src/chrome\", \n \"version\": 1\n}",
|
| + "[CWD]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write ct-nanobench-2.isolated.gen.json"
|
| },
|
| {
|
| @@ -482,10 +464,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]/skps/slave3",
|
| + "[CWD]/skps/slave3",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs SKPs dir (3)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -506,16 +487,15 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "-m",
|
| "rsync",
|
| "-d",
|
| "-r",
|
| "gs://cluster-telemetry/skps/10k/57259e0-05dcb4c/slave3",
|
| - "[SLAVE_BUILD]/skps/slave3"
|
| + "[CWD]/skps/slave3"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil rsync (3)"
|
| },
|
| {
|
| @@ -523,10 +503,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 (3)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -546,10 +525,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json"
|
| + "{\n \"args\": [\n \"--isolate\", \n \"[CWD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[CWD]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CWD]/src/chrome\", \n \"version\": 1\n}",
|
| + "[CWD]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write ct-nanobench-3.isolated.gen.json"
|
| },
|
| {
|
| @@ -557,10 +535,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]/skps/slave4",
|
| + "[CWD]/skps/slave4",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs SKPs dir (4)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -581,16 +558,15 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "-m",
|
| "rsync",
|
| "-d",
|
| "-r",
|
| "gs://cluster-telemetry/skps/10k/57259e0-05dcb4c/slave4",
|
| - "[SLAVE_BUILD]/skps/slave4"
|
| + "[CWD]/skps/slave4"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil rsync (4)"
|
| },
|
| {
|
| @@ -598,10 +574,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 (4)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -621,10 +596,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json"
|
| + "{\n \"args\": [\n \"--isolate\", \n \"[CWD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[CWD]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CWD]/src/chrome\", \n \"version\": 1\n}",
|
| + "[CWD]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write ct-nanobench-4.isolated.gen.json"
|
| },
|
| {
|
| @@ -632,10 +606,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]/skps/slave5",
|
| + "[CWD]/skps/slave5",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs SKPs dir (5)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -656,16 +629,15 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "-m",
|
| "rsync",
|
| "-d",
|
| "-r",
|
| "gs://cluster-telemetry/skps/10k/57259e0-05dcb4c/slave5",
|
| - "[SLAVE_BUILD]/skps/slave5"
|
| + "[CWD]/skps/slave5"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil rsync (5)"
|
| },
|
| {
|
| @@ -673,10 +645,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 (5)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -696,10 +667,9 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[SLAVE_BUILD]/src/chrome\", \n \"version\": 1\n}",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json"
|
| + "{\n \"args\": [\n \"--isolate\", \n \"[CWD]/src/chrome/ct_skps.isolate\", \n \"--isolated\", \n \"[CWD]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"GIT_HASH\", \n 164710, \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CWD]/src/chrome\", \n \"version\": 1\n}",
|
| + "[CWD]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write ct-nanobench-5.isolated.gen.json"
|
| },
|
| {
|
| @@ -707,20 +677,19 @@
|
| "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/ct-nanobench-1.isolated.gen.json",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json"
|
| + "[CWD]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json",
|
| + "[CWD]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json",
|
| + "[CWD]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json",
|
| + "[CWD]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json",
|
| + "[CWD]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -738,7 +707,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -782,7 +751,6 @@
|
| "stepname:ct-nanobench-1 on Ubuntu-14.04",
|
| "[dummy hash for ct-nanobench-1]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] ct-nanobench-1 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -803,7 +771,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -847,7 +815,6 @@
|
| "stepname:ct-nanobench-2 on Ubuntu-14.04",
|
| "[dummy hash for ct-nanobench-2]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] ct-nanobench-2 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -868,7 +835,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -912,7 +879,6 @@
|
| "stepname:ct-nanobench-3 on Ubuntu-14.04",
|
| "[dummy hash for ct-nanobench-3]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] ct-nanobench-3 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -933,7 +899,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -977,7 +943,6 @@
|
| "stepname:ct-nanobench-4 on Ubuntu-14.04",
|
| "[dummy hash for ct-nanobench-4]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] ct-nanobench-4 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -998,7 +963,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -1042,7 +1007,6 @@
|
| "stepname:ct-nanobench-5 on Ubuntu-14.04",
|
| "[dummy hash for ct-nanobench-5]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] ct-nanobench-5 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -1063,7 +1027,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "collect",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -1075,9 +1039,8 @@
|
| "--task-summary-json",
|
| "/path/to/tmp/json",
|
| "--task-output-dir",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1"
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-1"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ct-nanobench-1 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| @@ -1127,10 +1090,9 @@
|
| "python",
|
| "-u",
|
| "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1/0",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-1/0",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "listdir output dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@[@@@",
|
| @@ -1152,14 +1114,13 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-R",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1",
|
| "gs://skia-perf/ct/10k/2012/05/14/12/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": null,
|
| "BOTO_CONFIG": null
|
| @@ -1175,14 +1136,13 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-R",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2",
|
| "gs://skia-perf/ct/10k/2012/05/14/12/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": null,
|
| "BOTO_CONFIG": null
|
| @@ -1196,7 +1156,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "collect",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -1208,9 +1168,8 @@
|
| "--task-summary-json",
|
| "/path/to/tmp/json",
|
| "--task-output-dir",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2"
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-2"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ct-nanobench-2 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| @@ -1260,10 +1219,9 @@
|
| "python",
|
| "-u",
|
| "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2/0",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-2/0",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "listdir output dir (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@[@@@",
|
| @@ -1285,14 +1243,13 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-R",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1",
|
| "gs://skia-perf/ct/10k/2012/05/14/12/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": null,
|
| "BOTO_CONFIG": null
|
| @@ -1308,14 +1265,13 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-R",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2",
|
| "gs://skia-perf/ct/10k/2012/05/14/12/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": null,
|
| "BOTO_CONFIG": null
|
| @@ -1329,7 +1285,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "collect",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -1341,9 +1297,8 @@
|
| "--task-summary-json",
|
| "/path/to/tmp/json",
|
| "--task-output-dir",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3"
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-3"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ct-nanobench-3 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| @@ -1393,10 +1348,9 @@
|
| "python",
|
| "-u",
|
| "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3/0",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-3/0",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "listdir output dir (3)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@[@@@",
|
| @@ -1418,14 +1372,13 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-R",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1",
|
| "gs://skia-perf/ct/10k/2012/05/14/12/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": null,
|
| "BOTO_CONFIG": null
|
| @@ -1441,14 +1394,13 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-R",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2",
|
| "gs://skia-perf/ct/10k/2012/05/14/12/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": null,
|
| "BOTO_CONFIG": null
|
| @@ -1462,7 +1414,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "collect",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -1474,9 +1426,8 @@
|
| "--task-summary-json",
|
| "/path/to/tmp/json",
|
| "--task-output-dir",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4"
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-4"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ct-nanobench-4 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| @@ -1526,10 +1477,9 @@
|
| "python",
|
| "-u",
|
| "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4/0",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-4/0",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "listdir output dir (4)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@[@@@",
|
| @@ -1551,14 +1501,13 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-R",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1",
|
| "gs://skia-perf/ct/10k/2012/05/14/12/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": null,
|
| "BOTO_CONFIG": null
|
| @@ -1574,14 +1523,13 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-R",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2",
|
| "gs://skia-perf/ct/10k/2012/05/14/12/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": null,
|
| "BOTO_CONFIG": null
|
| @@ -1595,7 +1543,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "collect",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -1607,9 +1555,8 @@
|
| "--task-summary-json",
|
| "/path/to/tmp/json",
|
| "--task-output-dir",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5"
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-5"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ct-nanobench-5 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| @@ -1659,10 +1606,9 @@
|
| "python",
|
| "-u",
|
| "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5/0",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-5/0",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "listdir output dir (5)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@[@@@",
|
| @@ -1684,14 +1630,13 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-R",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1",
|
| "gs://skia-perf/ct/10k/2012/05/14/12/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": null,
|
| "BOTO_CONFIG": null
|
| @@ -1707,14 +1652,13 @@
|
| "-u",
|
| "RECIPE_MODULE[build::gsutil]/resources/gsutil_wrapper.py",
|
| "--",
|
| - "[DEPOT_TOOLS]/gsutil.py",
|
| + "[ROOT]/b/depot_tools/gsutil.py",
|
| "----",
|
| "cp",
|
| "-R",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2",
|
| + "[CWD]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2",
|
| "gs://skia-perf/ct/10k/2012/05/14/12/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "AWS_CREDENTIAL_FILE": null,
|
| "BOTO_CONFIG": null
|
|
|