From 0a131b41eaaf1651d7ccf6de0cbbff5a42804973 Mon Sep 17 00:00:00 2001
From: "Mikhail f. Shiryaev" <felixoid@clickhouse.com>
Date: Mon, 25 Apr 2022 20:32:15 +0200
Subject: [PATCH] Improve release.py

- Improve check-dirty
- Prefetch target branches
- Prefetch release commit
- Simplify check_branch
---
 tests/ci/release.py | 46 ++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/tests/ci/release.py b/tests/ci/release.py
index 09de82a65da..8dcf80e331e 100755
--- a/tests/ci/release.py
+++ b/tests/ci/release.py
@@ -5,6 +5,7 @@ from contextlib import contextmanager
 from typing import List, Optional
 import argparse
 import logging
+import subprocess
 
 from git_helper import commit, release_branch
 from version_helper import (
@@ -74,6 +75,9 @@ class Release:
         return self._git.run(cmd, cwd)
 
     def set_release_branch(self):
+        # Fetch release commit in case it does not exist locally
+        self.run(f"git fetch {self.repo.url} {self.release_commit}")
+
         # Get the actual version for the commit before check
         with self._checkout(self.release_commit, True):
             self.read_version()
@@ -97,7 +101,11 @@ class Release:
 
         if check_dirty:
             logging.info("Checking if repo is clean")
-            self.run("git diff HEAD --exit-code")
+            try:
+                self.run("git diff HEAD --exit-code")
+            except subprocess.CalledProcessError:
+                logging.fatal("Repo contains uncommitted changes")
+                raise
 
         self.set_release_branch()
 
@@ -131,26 +139,26 @@ class Release:
             )
 
     def check_branch(self):
+        branch = self.release_branch
         if self.release_type in self.BIG:
             # Commit to spin up the release must belong to a main branch
             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 {branch} for "
-                    f"{self.release_type} release"
+        elif self.release_type not in self.SMALL:
+            raise (
+                ValueError(
+                    f"release_type {self.release_type} neiter in {self.BIG} nor "
+                    f"in {self.SMALL}"
                 )
-            return
-        elif self.release_type in self.SMALL:
-            output = self.run(
-                f"git branch --contains={self.release_commit} {self.release_branch}"
             )
-            if self.release_branch not in output:
-                raise Exception(
-                    f"commit {self.release_commit} must be in "
-                    f"'{self.release_branch}' branch for {self.release_type} release"
-                )
-            return
+
+        # Prefetch the branch to have it updated
+        self.run(f"git fetch {self.repo.url} {branch}:{branch}")
+        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 {branch} "
+                f"for {self.release_type} release"
+            )
 
     def log_rollback(self):
         if self._rollback_stack:
@@ -452,9 +460,9 @@ def parse_args() -> argparse.Namespace:
         dest="check_branch",
         action="store_false",
         default=argparse.SUPPRESS,
-        help="(debug or development only) if set, skip the branch check for a run. "
-        "By default, 'major' and 'minor' types workonly for master, and 'patch' works "
-        "only for a release branches, that name "
+        help="(debug or development only, dangerous) if set, skip the branch check for "
+        "a run. By default, 'major' and 'minor' types workonly for master, and 'patch' "
+        "works only for a release branches, that name "
         "should be the same as '$MAJOR.$MINOR' version, e.g. 22.2",
     )