| Index: scripts/slave/recipes/skia/ct_skps.expected/CT_DM_1m_SKPs.json
|
| diff --git a/scripts/slave/recipes/skia/ct_skps.expected/CT_DM_1m_SKPs.json b/scripts/slave/recipes/skia/ct_skps.expected/CT_DM_1m_SKPs.json
|
| index fb1ce75641b7a4ec2d610f775e23977731358e40..90938a61d359e8732ed337d0c441be0de5a9bdef 100644
|
| --- a/scripts/slave/recipes/skia/ct_skps.expected/CT_DM_1m_SKPs.json
|
| +++ b/scripts/slave/recipes/skia/ct_skps.expected/CT_DM_1m_SKPs.json
|
| @@ -6,9 +6,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]"
|
| },
|
| @@ -31,7 +30,6 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -57,11 +55,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)"
|
| },
|
| {
|
| @@ -72,7 +69,7 @@
|
| "origin",
|
| "master"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "cwd": "[CWD]/swarming.client",
|
| "name": "git fetch (swarming_client)"
|
| },
|
| {
|
| @@ -82,7 +79,7 @@
|
| "-f",
|
| "FETCH_HEAD"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "cwd": "[CWD]/swarming.client",
|
| "name": "git checkout (swarming_client)"
|
| },
|
| {
|
| @@ -91,7 +88,7 @@
|
| "rev-parse",
|
| "HEAD"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "cwd": "[CWD]/swarming.client",
|
| "name": "read revision",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -106,7 +103,7 @@
|
| "-d",
|
| "-x"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "cwd": "[CWD]/swarming.client",
|
| "name": "git clean (swarming_client)"
|
| },
|
| {
|
| @@ -115,7 +112,7 @@
|
| "submodule",
|
| "sync"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "cwd": "[CWD]/swarming.client",
|
| "name": "submodule sync (swarming_client)"
|
| },
|
| {
|
| @@ -126,17 +123,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": [
|
| @@ -152,9 +148,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"
|
| },
|
| {
|
| @@ -166,9 +161,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"
|
| },
|
| {
|
| @@ -180,9 +174,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"
|
| },
|
| {
|
| @@ -190,9 +183,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@@@@",
|
| @@ -210,11 +202,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"
|
| },
|
| {
|
| @@ -223,7 +214,7 @@
|
| "dm",
|
| "BUILDTYPE=Debug"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/skia",
|
| + "cwd": "[CWD]/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/\"@@@"
|
| @@ -234,9 +225,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@@@@",
|
| @@ -254,10 +244,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@@@@",
|
| @@ -278,16 +267,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/All/57259e0-05dcb4c/slave1",
|
| - "[SLAVE_BUILD]/skps/slave1"
|
| + "[CWD]/skps/slave1"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil rsync"
|
| },
|
| {
|
| @@ -295,10 +283,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@@@@",
|
| @@ -318,10 +305,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-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"
|
| + "{\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"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write ct-dm-1.isolated.gen.json"
|
| },
|
| {
|
| @@ -329,10 +315,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@@@@",
|
| @@ -353,16 +338,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/All/57259e0-05dcb4c/slave2",
|
| - "[SLAVE_BUILD]/skps/slave2"
|
| + "[CWD]/skps/slave2"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil rsync (2)"
|
| },
|
| {
|
| @@ -370,10 +354,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@@@@",
|
| @@ -393,10 +376,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-dm-2.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 \"2\", \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-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-dm-2.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 \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CWD]/src/chrome\", \n \"version\": 1\n}",
|
| + "[CWD]/swarming_temp_dir/ct-dm-2.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write ct-dm-2.isolated.gen.json"
|
| },
|
| {
|
| @@ -404,10 +386,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@@@@",
|
| @@ -428,16 +409,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/All/57259e0-05dcb4c/slave3",
|
| - "[SLAVE_BUILD]/skps/slave3"
|
| + "[CWD]/skps/slave3"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil rsync (3)"
|
| },
|
| {
|
| @@ -445,10 +425,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@@@@",
|
| @@ -468,10 +447,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-dm-3.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 \"3\", \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-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-dm-3.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 \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CWD]/src/chrome\", \n \"version\": 1\n}",
|
| + "[CWD]/swarming_temp_dir/ct-dm-3.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write ct-dm-3.isolated.gen.json"
|
| },
|
| {
|
| @@ -479,10 +457,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@@@@",
|
| @@ -503,16 +480,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/All/57259e0-05dcb4c/slave4",
|
| - "[SLAVE_BUILD]/skps/slave4"
|
| + "[CWD]/skps/slave4"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil rsync (4)"
|
| },
|
| {
|
| @@ -520,10 +496,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@@@@",
|
| @@ -543,10 +518,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-dm-4.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 \"4\", \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-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-dm-4.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 \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CWD]/src/chrome\", \n \"version\": 1\n}",
|
| + "[CWD]/swarming_temp_dir/ct-dm-4.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write ct-dm-4.isolated.gen.json"
|
| },
|
| {
|
| @@ -554,10 +528,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@@@@",
|
| @@ -578,16 +551,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/All/57259e0-05dcb4c/slave5",
|
| - "[SLAVE_BUILD]/skps/slave5"
|
| + "[CWD]/skps/slave5"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gsutil rsync (5)"
|
| },
|
| {
|
| @@ -595,10 +567,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@@@@",
|
| @@ -618,10 +589,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-dm-5.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 \"5\", \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-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-dm-5.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 \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CWD]/src/chrome\", \n \"version\": 1\n}",
|
| + "[CWD]/swarming_temp_dir/ct-dm-5.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write ct-dm-5.isolated.gen.json"
|
| },
|
| {
|
| @@ -629,20 +599,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-dm-1.isolated.gen.json",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-2.isolated.gen.json",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-3.isolated.gen.json",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-4.isolated.gen.json",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/ct-dm-5.isolated.gen.json"
|
| + "[CWD]/swarming_temp_dir/ct-dm-1.isolated.gen.json",
|
| + "[CWD]/swarming_temp_dir/ct-dm-2.isolated.gen.json",
|
| + "[CWD]/swarming_temp_dir/ct-dm-3.isolated.gen.json",
|
| + "[CWD]/swarming_temp_dir/ct-dm-4.isolated.gen.json",
|
| + "[CWD]/swarming_temp_dir/ct-dm-5.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -660,7 +629,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -701,7 +670,6 @@
|
| "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@{@@@",
|
| @@ -722,7 +690,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -763,7 +731,6 @@
|
| "stepname:ct-dm-2 on Ubuntu-14.04",
|
| "[dummy hash for ct-dm-2]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] ct-dm-2 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -784,7 +751,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -825,7 +792,6 @@
|
| "stepname:ct-dm-3 on Ubuntu-14.04",
|
| "[dummy hash for ct-dm-3]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] ct-dm-3 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -846,7 +812,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -887,7 +853,6 @@
|
| "stepname:ct-dm-4 on Ubuntu-14.04",
|
| "[dummy hash for ct-dm-4]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] ct-dm-4 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -908,7 +873,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "trigger",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -949,7 +914,6 @@
|
| "stepname:ct-dm-5 on Ubuntu-14.04",
|
| "[dummy hash for ct-dm-5]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] ct-dm-5 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -970,7 +934,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "collect",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -982,9 +946,8 @@
|
| "--task-summary-json",
|
| "/path/to/tmp/json",
|
| "--task-output-dir",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-1"
|
| + "[CWD]/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@@@",
|
| @@ -1033,7 +996,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "collect",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -1045,9 +1008,8 @@
|
| "--task-summary-json",
|
| "/path/to/tmp/json",
|
| "--task-output-dir",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-2"
|
| + "[CWD]/swarming_temp_dir/outputs/ct-dm-2"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ct-dm-2 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| @@ -1096,7 +1058,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "collect",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -1108,9 +1070,8 @@
|
| "--task-summary-json",
|
| "/path/to/tmp/json",
|
| "--task-output-dir",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-3"
|
| + "[CWD]/swarming_temp_dir/outputs/ct-dm-3"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ct-dm-3 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| @@ -1159,7 +1120,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "collect",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -1171,9 +1132,8 @@
|
| "--task-summary-json",
|
| "/path/to/tmp/json",
|
| "--task-output-dir",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-4"
|
| + "[CWD]/swarming_temp_dir/outputs/ct-dm-4"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ct-dm-4 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| @@ -1222,7 +1182,7 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "[CWD]/swarming.client/swarming.py",
|
| "collect",
|
| "--swarming",
|
| "https://chromium-swarm.appspot.com",
|
| @@ -1234,9 +1194,8 @@
|
| "--task-summary-json",
|
| "/path/to/tmp/json",
|
| "--task-output-dir",
|
| - "[SLAVE_BUILD]/swarming_temp_dir/outputs/ct-dm-5"
|
| + "[CWD]/swarming_temp_dir/outputs/ct-dm-5"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "ct-dm-5 on Ubuntu-14.04",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
|
|