RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ptl-tool: make branch name configurable

Browse Source 
Also, include hours/minutes in branch so multiple branches in a day have
different names.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
This commit is contained in:
Patrick Donnelly 2017-10-23 17:44:19 -07:00
parent 7d3023d8e6
commit 9902f5c51d
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/script/ptl-tool.py
View File

@ -88,11 +88,10 @@ log.setLevel(logging.INFO)
BASE_REMOTE = os.getenv("PTL_TOOL_BASE_REMOTE", "upstream") BASE_REMOTE = os.getenv("PTL_TOOL_BASE_REMOTE", "upstream")
BASE_PATH = os.getenv("PTL_TOOL_BASE_PATH", "refs/remotes/upstream/heads/") BASE_PATH = os.getenv("PTL_TOOL_BASE_PATH", "refs/remotes/upstream/heads/")
GITDIR = os.getenv("PTL_TOOL_GITDIR", ".") GITDIR = os.getenv("PTL_TOOL_GITDIR", ".")
USER = getpass.getuser() USER = os.getenv("PTL_TOOL_USER", getpass.getuser())
with open(expanduser("~/.github.key")) as f: with open(expanduser("~/.github.key")) as f:
PASSWORD = f.read().strip() PASSWORD = f.read().strip()
BRANCH_PREFIX = "wip-%s-testing-" % USER TEST_BRANCH = os.getenv("PTL_TOOL_TEST_BRANCH", "wip-{user}-testing-%Y%m%d.%H%M%S")
TESTING_BRANCH_NAME = BRANCH_PREFIX + datetime.datetime.now().strftime("%Y%m%d")
SPECIAL_BRANCHES = ('master', 'luminous', 'jewel', 'HEAD') SPECIAL_BRANCHES = ('master', 'luminous', 'jewel', 'HEAD')
@ -118,8 +117,11 @@ TRACKER_MATCH = re.compile("(.*https?://tracker.ceph.com/.*)")
def build_branch(args): def build_branch(args):
base = args.base base = args.base
branch = args.branch branch = datetime.datetime.utcnow().strftime(args.branch).format(user=USER)
label = args.label label = args.label
merge_branch_name = args.merge_branch_name
if merge_branch_name is False:
merge_branch_name = branch
if label: if label:
#Check the label format #Check the label format
@ -190,7 +192,7 @@ def build_branch(args):
log.error("PR '{pr}' not found: {c}".format(pr=pr,c=pr_req)) log.error("PR '{pr}' not found: {c}".format(pr=pr,c=pr_req))
sys.exit(1) sys.exit(1)
message = "Merge PR #%d into %s\n\n* %s:\n" % (pr, args.merge_branch_name, remote_ref) message = "Merge PR #%d into %s\n\n* %s:\n" % (pr, merge_branch_name, remote_ref)
for commit in G.iter_commits(rev="HEAD.."+str(tip)): for commit in G.iter_commits(rev="HEAD.."+str(tip)):
message = message + ("\t%s\n" % commit.message.split('\n', 1)[0]) message = message + ("\t%s\n" % commit.message.split('\n', 1)[0])
@ -303,7 +305,7 @@ def build_branch(args):
def main(): def main():
parser = argparse.ArgumentParser(description="Ceph PTL tool") parser = argparse.ArgumentParser(description="Ceph PTL tool")
default_base = 'master' default_base = 'master'
default_branch = TESTING_BRANCH_NAME default_branch = TEST_BRANCH
default_label = '' default_label = ''
if len(sys.argv) > 1 and sys.argv[1] in SPECIAL_BRANCHES: if len(sys.argv) > 1 and sys.argv[1] in SPECIAL_BRANCHES:
argv = sys.argv[2:] argv = sys.argv[2:]
@ -313,7 +315,7 @@ def main():
else: else:
argv = sys.argv[1:] argv = sys.argv[1:]
parser.add_argument('--branch', dest='branch', action='store', default=default_branch, help='branch to create ("HEAD" leaves HEAD detached; i.e. no branch is made)') parser.add_argument('--branch', dest='branch', action='store', default=default_branch, help='branch to create ("HEAD" leaves HEAD detached; i.e. no branch is made)')
parser.add_argument('--merge-branch-name', dest='merge_branch_name', action='store', help='name of the branch for merge messages') parser.add_argument('--merge-branch-name', dest='merge_branch_name', action='store', default=False, help='name of the branch for merge messages')
parser.add_argument('--base', dest='base', action='store', default=default_base, help='base for branch') parser.add_argument('--base', dest='base', action='store', default=default_base, help='base for branch')
parser.add_argument('--base-path', dest='base_path', action='store', default=BASE_PATH, help='base for branch') parser.add_argument('--base-path', dest='base_path', action='store', default=BASE_PATH, help='base for branch')
parser.add_argument('--git-dir', dest='git', action='store', default=GITDIR, help='git directory') parser.add_argument('--git-dir', dest='git', action='store', default=GITDIR, help='git directory')
@ -321,8 +323,6 @@ def main():
parser.add_argument('--pr-label', dest='pr_label', action='store', help='label PRs for testing') parser.add_argument('--pr-label', dest='pr_label', action='store', help='label PRs for testing')
parser.add_argument('prs', metavar="PR", type=int, nargs='*', help='Pull Requests to merge') parser.add_argument('prs', metavar="PR", type=int, nargs='*', help='Pull Requests to merge')
args = parser.parse_args(argv) args = parser.parse_args(argv)
if getattr(args, 'merge_branch_name') is None:
setattr(args, 'merge_branch_name', args.branch)
return build_branch(args) return build_branch(args)
if __name__ == "__main__": if __name__ == "__main__":