| Index: scripts/slave/recipes/v8/auto_tag.expected/update_timeout.json
|
| diff --git a/scripts/slave/recipes/v8/auto_tag.expected/update_timeout.json b/scripts/slave/recipes/v8/auto_tag.expected/update_timeout.json
|
| index 203ab0873c346dd88bebc9ab71896068d8dc8a57..95fe160e047d5abe3631bd8a31b2d378ecbfac80 100644
|
| --- a/scripts/slave/recipes/v8/auto_tag.expected/update_timeout.json
|
| +++ b/scripts/slave/recipes/v8/auto_tag.expected/update_timeout.json
|
| @@ -6,8 +6,9 @@
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "config",
|
| "--spec",
|
| - "cache_dir = '[ROOT]/b/build/slave/cache_dir'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]"
|
| + "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -27,6 +28,7 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -50,7 +52,7 @@
|
| "-f",
|
| "FETCH_HEAD"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git checkout"
|
| },
|
| {
|
| @@ -60,7 +62,7 @@
|
| "-D",
|
| "work"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git branch"
|
| },
|
| {
|
| @@ -69,7 +71,7 @@
|
| "clean",
|
| "-ffd"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git clean"
|
| },
|
| {
|
| @@ -78,7 +80,7 @@
|
| "show",
|
| "refs/remotes/branch-heads/3.4:include/v8-version.h"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "Check latest version file",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -88,7 +90,7 @@
|
| "show",
|
| "refs/remotes/branch-heads/3.4~1:include/v8-version.h"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "Check previous version file",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -100,7 +102,7 @@
|
| "--upstream",
|
| "refs/remotes/branch-heads/3.4"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git new-branch"
|
| },
|
| {
|
| @@ -109,8 +111,9 @@
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| "\n#define V8_MAJOR_VERSION 3\n#define V8_MINOR_VERSION 4\n#define V8_BUILD_NUMBER 3\n#define V8_PATCH_LEVEL 3\n",
|
| - "[CWD]/v8/include/v8-version.h"
|
| + "[SLAVE_BUILD]/v8/include/v8-version.h"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Increment version"
|
| },
|
| {
|
| @@ -120,7 +123,7 @@
|
| "-am",
|
| "Version 3.4.3.3"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git commit"
|
| },
|
| {
|
| @@ -131,7 +134,7 @@
|
| "-f",
|
| "--bypass-hooks"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git cl"
|
| },
|
| {
|
| @@ -139,7 +142,7 @@
|
| "git",
|
| "fetch"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git fetch"
|
| },
|
| {
|
| @@ -148,7 +151,7 @@
|
| "show",
|
| "refs/remotes/branch-heads/3.4:include/v8-version.h"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "Check committed version file",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -158,6 +161,7 @@
|
| "-u",
|
| "import time; time.sleep(5)"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Wait for commit",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@import time; time.sleep(5)@@@",
|
| @@ -169,7 +173,7 @@
|
| "git",
|
| "fetch"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git fetch (2)"
|
| },
|
| {
|
| @@ -178,7 +182,7 @@
|
| "show",
|
| "refs/remotes/branch-heads/3.4:include/v8-version.h"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "Check committed version file (2)",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -188,6 +192,7 @@
|
| "-u",
|
| "import time; time.sleep(10)"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Wait for commit (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@import time; time.sleep(10)@@@",
|
| @@ -199,7 +204,7 @@
|
| "git",
|
| "fetch"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git fetch (3)"
|
| },
|
| {
|
| @@ -208,7 +213,7 @@
|
| "show",
|
| "refs/remotes/branch-heads/3.4:include/v8-version.h"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "Check committed version file (3)",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -218,6 +223,7 @@
|
| "-u",
|
| "import time; time.sleep(15)"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Wait for commit (3)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@import time; time.sleep(15)@@@",
|
| @@ -229,7 +235,7 @@
|
| "git",
|
| "fetch"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git fetch (4)"
|
| },
|
| {
|
| @@ -238,7 +244,7 @@
|
| "show",
|
| "refs/remotes/branch-heads/3.4:include/v8-version.h"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "Check committed version file (4)",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -248,6 +254,7 @@
|
| "-u",
|
| "import time; time.sleep(20)"
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Wait for commit (4)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@import time; time.sleep(20)@@@",
|
| @@ -259,7 +266,7 @@
|
| "git",
|
| "fetch"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git fetch (5)"
|
| },
|
| {
|
| @@ -268,12 +275,13 @@
|
| "show",
|
| "refs/remotes/branch-heads/3.4:include/v8-version.h"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "Check committed version file (5)",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| {
|
| "cmd": [],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "Waiting for commit timed out",
|
| "~followup_annotations": [
|
| "@@@STEP_FAILURE@@@"
|
| @@ -287,7 +295,7 @@
|
| "--format=%H",
|
| "refs/remotes/branch-heads/3.4"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git log",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -297,7 +305,7 @@
|
| "show",
|
| "74882b7a8e55268d1658f83efefa1c2585cee723:include/v8-version.h"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "Check head version file",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -308,7 +316,7 @@
|
| "--tags",
|
| "74882b7a8e55268d1658f83efefa1c2585cee723"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git describe",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -319,7 +327,7 @@
|
| "https://chromium.googlesource.com/v8/v8",
|
| "refs/heads/3.4-lkgr"
|
| ],
|
| - "cwd": "[CWD]/v8",
|
| + "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "git ls-remote 3.4-lkgr",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -332,6 +340,7 @@
|
| "echo",
|
| "There is no new lkgr."
|
| ],
|
| + "cwd": "[SLAVE_BUILD]",
|
| "name": "log"
|
| },
|
| {
|
|
|