Merge pull request #64039 from ClickHouse/new-release-create-branch-only

Do not create new release in release branch automatically

tests/ci/release.py

@@ -406,7 +406,7 @@ class Release:
     def _bump_release_branch(self):
         # Update only git, original version stays the same
         self._git.update()
-        new_version = self.version.patch_update()
+        new_version = self.version.copy()
         version_type = self.get_stable_release_type()
         pr_labels = f"--label {Labels.RELEASE}"
         if version_type == VersionType.LTS:
@@ -432,9 +432,10 @@ class Release:
                         "changes with it.'",
                         dry_run=self.dry_run,
                     )
-                    with self._create_gh_release(False):
-                        # Here the release branch part is done
-                        yield
+                    # Here the release branch part is done.
+                    # We don't create a release itself automatically to have a
+                    # safe window to backport possible bug fixes.
+                    yield
 
     @contextmanager
     def _bump_version_in_master(self, helper_branch: str) -> Iterator[None]:

tests/ci/version_helper.py

@@ -165,6 +165,21 @@ class ClickHouseVersion:
         self._description = version_type
         self._describe = f"v{self.string}-{version_type}"
 
+    def copy(self) -> "ClickHouseVersion":
+        copy = ClickHouseVersion(
+            self.major,
+            self.minor,
+            self.patch,
+            self.revision,
+            self._git,
+            str(self.tweak),
+        )
+        try:
+            copy.with_description(self.description)
+        except ValueError:
+            pass
+        return copy
+
     def __eq__(self, other: Any) -> bool:
         if not isinstance(self, type(other)):
             return NotImplemented