From ae22d7f8739fe838fafb2d118f9b8a316403383b Mon Sep 17 00:00:00 2001 From: machenbach Date: Mon, 26 Jan 2015 06:20:59 -0800 Subject: [PATCH] External name changes of release scripts. Moved and renamed the scripts to fit with git. These changes require documentation updates, updates of the release spreadsheet and the buildbot side. BUG=chromium:451975 TBR=tandrii@chromium.org NOTRY=true LOG=n Review URL: https://codereview.chromium.org/868473004 Cr-Commit-Position: refs/heads/master@{#26271} --- tools/{push-to-trunk => release}/auto_push.py | 4 ++-- tools/{push-to-trunk => release}/auto_roll.py | 0 tools/{push-to-trunk => release}/auto_tag.py | 0 .../{push-to-trunk => release}/check_clusterfuzz.py | 0 tools/{push-to-trunk => release}/chromium_roll.py | 0 tools/{push-to-trunk => release}/common_includes.py | 0 tools/{push-to-trunk => release}/git_recipes.py | 0 tools/{push-to-trunk => release}/merge_to_branch.py | 0 .../push_to_candidates.py} | 0 tools/{push-to-trunk => release}/releases.py | 4 ++-- tools/{push-to-trunk => release}/script_test.py | 0 tools/{push-to-trunk => release}/test_scripts.py | 20 ++++++++++---------- 12 files changed, 14 insertions(+), 14 deletions(-) rename tools/{push-to-trunk => release}/auto_push.py (97%) rename tools/{push-to-trunk => release}/auto_roll.py (100%) rename tools/{push-to-trunk => release}/auto_tag.py (100%) rename tools/{push-to-trunk => release}/check_clusterfuzz.py (100%) rename tools/{push-to-trunk => release}/chromium_roll.py (100%) rename tools/{push-to-trunk => release}/common_includes.py (100%) rename tools/{push-to-trunk => release}/git_recipes.py (100%) rename tools/{push-to-trunk => release}/merge_to_branch.py (100%) rename tools/{push-to-trunk/push_to_trunk.py => release/push_to_candidates.py} (100%) rename tools/{push-to-trunk => release}/releases.py (99%) rename tools/{push-to-trunk => release}/script_test.py (100%) rename tools/{push-to-trunk => release}/test_scripts.py (99%) diff --git a/tools/push-to-trunk/auto_push.py b/tools/release/auto_push.py similarity index 97% rename from tools/push-to-trunk/auto_push.py rename to tools/release/auto_push.py index aab329b..f6cdcb6 100755 --- a/tools/push-to-trunk/auto_push.py +++ b/tools/release/auto_push.py @@ -34,7 +34,7 @@ import sys import urllib from common_includes import * -import push_to_trunk +import push_to_candidates PUSH_MESSAGE_RE = re.compile(r".* \(based on ([a-fA-F0-9]+)\)$") @@ -93,7 +93,7 @@ class PushToCandidates(Step): # TODO(machenbach): Update the script before calling it. if self._options.push: self._side_effect_handler.Call( - push_to_trunk.PushToCandidates().Run, args) + push_to_candidates.PushToCandidates().Run, args) class AutoPush(ScriptsBase): diff --git a/tools/push-to-trunk/auto_roll.py b/tools/release/auto_roll.py similarity index 100% rename from tools/push-to-trunk/auto_roll.py rename to tools/release/auto_roll.py diff --git a/tools/push-to-trunk/auto_tag.py b/tools/release/auto_tag.py similarity index 100% rename from tools/push-to-trunk/auto_tag.py rename to tools/release/auto_tag.py diff --git a/tools/push-to-trunk/check_clusterfuzz.py b/tools/release/check_clusterfuzz.py similarity index 100% rename from tools/push-to-trunk/check_clusterfuzz.py rename to tools/release/check_clusterfuzz.py diff --git a/tools/push-to-trunk/chromium_roll.py b/tools/release/chromium_roll.py similarity index 100% rename from tools/push-to-trunk/chromium_roll.py rename to tools/release/chromium_roll.py diff --git a/tools/push-to-trunk/common_includes.py b/tools/release/common_includes.py similarity index 100% rename from tools/push-to-trunk/common_includes.py rename to tools/release/common_includes.py diff --git a/tools/push-to-trunk/git_recipes.py b/tools/release/git_recipes.py similarity index 100% rename from tools/push-to-trunk/git_recipes.py rename to tools/release/git_recipes.py diff --git a/tools/push-to-trunk/merge_to_branch.py b/tools/release/merge_to_branch.py similarity index 100% rename from tools/push-to-trunk/merge_to_branch.py rename to tools/release/merge_to_branch.py diff --git a/tools/push-to-trunk/push_to_trunk.py b/tools/release/push_to_candidates.py similarity index 100% rename from tools/push-to-trunk/push_to_trunk.py rename to tools/release/push_to_candidates.py diff --git a/tools/push-to-trunk/releases.py b/tools/release/releases.py similarity index 99% rename from tools/push-to-trunk/releases.py rename to tools/release/releases.py index be65deb..46c90b7 100755 --- a/tools/push-to-trunk/releases.py +++ b/tools/release/releases.py @@ -170,9 +170,9 @@ class RetrieveV8Releases(Step): # The git revision on the branch. "revision_git": git_hash, # The cr commit position number on master. - "bleeding_edge": master_position, + "master_position": master_position, # The same for git. - "bleeding_edge_git": master_hash, + "master_hash": master_hash, # The branch name. "branch": branch, # The version for displaying in the form 3.26.3 or 3.26.3.12. diff --git a/tools/push-to-trunk/script_test.py b/tools/release/script_test.py similarity index 100% rename from tools/push-to-trunk/script_test.py rename to tools/release/script_test.py diff --git a/tools/push-to-trunk/test_scripts.py b/tools/release/test_scripts.py similarity index 99% rename from tools/push-to-trunk/test_scripts.py rename to tools/release/test_scripts.py index 58a5691..d6378f1 100644 --- a/tools/push-to-trunk/test_scripts.py +++ b/tools/release/test_scripts.py @@ -39,8 +39,8 @@ import common_includes from common_includes import * import merge_to_branch from merge_to_branch import * -import push_to_trunk -from push_to_trunk import * +import push_to_candidates +from push_to_candidates import * import chromium_roll from chromium_roll import ChromiumRoll import releases @@ -913,7 +913,7 @@ def get_list(): "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*\" " "origin/candidates"), "push_hash\n"), Cmd("git log -1 --format=%s push_hash", - "Version 3.22.5 (based on bleeding_edge revision r22622)\n"), + "Version 3.22.5 (based on abc)\n"), URL("https://chromium-build.appspot.com/p/chromium/sheriff_v8.js", "document.write('g_name')"), Cmd("git status -s -uno", "", cwd=chrome_dir), @@ -924,7 +924,7 @@ def get_list(): Cmd("git new-branch v8-roll-push_hash", "", cwd=chrome_dir), Cmd("roll-dep v8 push_hash", "rolled", cb=WriteDeps, cwd=chrome_dir), Cmd(("git commit -am \"Update V8 to version 3.22.5 " - "(based on bleeding_edge revision r22622).\n\n" + "(based on abc).\n\n" "Please reply to the V8 sheriff c_name@chromium.org in " "case of problems.\n\nTBR=c_name@chromium.org\" " "--author \"author@chromium.org \""), @@ -1331,8 +1331,8 @@ Cr-Commit-Position: refs/heads/candidates@{#345} { "revision": "345", "revision_git": "hash_345", - "bleeding_edge": "", - "bleeding_edge_git": "", + "master_position": "", + "master_hash": "", "patches_merged": "", "version": "3.22.3", "chromium_revision": "3456:4566", @@ -1346,8 +1346,8 @@ Cr-Commit-Position: refs/heads/candidates@{#345} "revision": "123", "revision_git": "hash_123", "patches_merged": "", - "bleeding_edge": "", - "bleeding_edge_git": "", + "master_position": "", + "master_hash": "", "version": "3.21.2", "chromium_revision": "", "branch": "3.21", @@ -1360,8 +1360,8 @@ Cr-Commit-Position: refs/heads/candidates@{#345} "revision": "234", "revision_git": "hash_234", "patches_merged": "abc12", - "bleeding_edge": "", - "bleeding_edge_git": "", + "master_position": "", + "master_hash": "", "version": "3.3.1.1", "chromium_revision": "", "branch": "3.3", -- 2.7.4