thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 15:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean-up the code a little bit

Browse Source
This commit is contained in:
Mikhail f. Shiryaev 2022-02-18 12:35:24 +01:00
parent e4d5db6161
commit 0f1565a3a2
No known key found for this signature in database
GPG Key ID: 4B02ED204C7D93F4
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/ci/release.py
View File

@ -74,16 +74,20 @@ class Release:
def check_branch(self, release_type: str):
if release_type in self.BIG:
# Commit to spin up the release must belong to a main branch
output = self.run(f"git branch --contains={self.release_commit} master")
if "master" not in output:
branch = "master"
output = self.run(f"git branch --contains={self.release_commit} '{branch}'")
if branch not in output:
raise Exception(
f"commit {self.release_commit} must belong to 'master' for "
f"{release_type} release"
)
if release_type in self.SMALL:
return
elif release_type in self.SMALL:
branch = f"{self.version.major}.{self.version.minor}"
if self._git.branch != branch:
output = self.run(f"git branch --contains={self.release_commit} '{branch}'")
if branch not in output:
raise Exception(f"branch must be '{branch}' for {release_type} release")
return
def log_rollback(self):
if self._rollback_stack:
@ -287,7 +291,6 @@ def parse_args() -> argparse.Namespace:
parser.add_argument(
"--type",
default="minor",
# choices=Release.BIG+Release.SMALL, # add support later
choices=Release.BIG + Release.SMALL,
dest="release_type",
help="a release type, new branch is created only for 'major' and 'minor'",
@ -320,10 +323,6 @@ def parse_args() -> argparse.Namespace:
return parser.parse_args()
def prestable():
pass
def main():
logging.basicConfig(level=logging.INFO)
args = parse_args()