Commit 84580949 authored by Sergiy Byelozyorov's avatar Sergiy Byelozyorov Committed by Commit Bot

Place all release script temp files into a common workdir

This makes it easier to restart an aborted merge.

R=machenbach@chromium.org
TEST=ran tools/release/script_test.py locally

Bug: v8:7410
Change-Id: I26b1b09e0000c9c689ad80be32ced9e35634bcec
Reviewed-on: https://chromium-review.googlesource.com/905665
Commit-Queue: Sergiy Byelozyorov <sergiyb@chromium.org>
Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51143}
parent 7352b3f8
...@@ -51,6 +51,7 @@ PUSH_MSG_GIT_RE = re.compile(r".* \(based on (?P<git_rev>[a-fA-F0-9]+)\)$") ...@@ -51,6 +51,7 @@ PUSH_MSG_GIT_RE = re.compile(r".* \(based on (?P<git_rev>[a-fA-F0-9]+)\)$")
PUSH_MSG_NEW_RE = re.compile(r"^Version \d+\.\d+\.\d+$") PUSH_MSG_NEW_RE = re.compile(r"^Version \d+\.\d+\.\d+$")
VERSION_FILE = os.path.join("include", "v8-version.h") VERSION_FILE = os.path.join("include", "v8-version.h")
WATCHLISTS_FILE = "WATCHLISTS" WATCHLISTS_FILE = "WATCHLISTS"
RELEASE_WORKDIR = "/tmp/v8-release-scripts-work-dir/"
# V8 base directory. # V8 base directory.
V8_BASE = os.path.dirname( V8_BASE = os.path.dirname(
......
...@@ -241,11 +241,12 @@ class MergeToBranch(ScriptsBase): ...@@ -241,11 +241,12 @@ class MergeToBranch(ScriptsBase):
def _Config(self): def _Config(self):
return { return {
"BRANCHNAME": "prepare-merge", "BRANCHNAME": "prepare-merge",
"PERSISTFILE_BASENAME": "/tmp/v8-merge-to-branch-tempfile", "PERSISTFILE_BASENAME": RELEASE_WORKDIR + "v8-merge-to-branch-tempfile",
"ALREADY_MERGING_SENTINEL_FILE": "ALREADY_MERGING_SENTINEL_FILE":
"/tmp/v8-merge-to-branch-tempfile-already-merging", RELEASE_WORKDIR + "v8-merge-to-branch-tempfile-already-merging",
"TEMPORARY_PATCH_FILE": "/tmp/v8-prepare-merge-tempfile-temporary-patch", "TEMPORARY_PATCH_FILE":
"COMMITMSG_FILE": "/tmp/v8-prepare-merge-tempfile-commitmsg", RELEASE_WORKDIR + "v8-prepare-merge-tempfile-temporary-patch",
"COMMITMSG_FILE": RELEASE_WORKDIR + "v8-prepare-merge-tempfile-commitmsg",
} }
def _Steps(self): def _Steps(self):
......
...@@ -262,11 +262,13 @@ class RollMerge(ScriptsBase): ...@@ -262,11 +262,13 @@ class RollMerge(ScriptsBase):
def _Config(self): def _Config(self):
return { return {
"BRANCHNAME": "prepare-merge", "BRANCHNAME": "prepare-merge",
"PERSISTFILE_BASENAME": "/tmp/v8-merge-to-branch-tempfile", "PERSISTFILE_BASENAME":
RELEASE_WORKDIR + "v8-merge-to-branch-tempfile",
"ALREADY_MERGING_SENTINEL_FILE": "ALREADY_MERGING_SENTINEL_FILE":
"/tmp/v8-merge-to-branch-tempfile-already-merging", RELEASE_WORKDIR + "v8-merge-to-branch-tempfile-already-merging",
"TEMPORARY_PATCH_FILE": "/tmp/v8-prepare-merge-tempfile-temporary-patch", "TEMPORARY_PATCH_FILE":
"COMMITMSG_FILE": "/tmp/v8-prepare-merge-tempfile-commitmsg", RELEASE_WORKDIR + "v8-prepare-merge-tempfile-temporary-patch",
"COMMITMSG_FILE": RELEASE_WORKDIR + "v8-prepare-merge-tempfile-commitmsg",
} }
def _Steps(self): def _Steps(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment