(PTFE-248) Remove stab branch (#250)

Author: matthiasL-scality

bert_e/exceptions.py

@@ -290,36 +290,6 @@ def __init__(self, name):
         super(BranchNameInvalid, self).__init__(msg)
 
 
-class UnsupportedMultipleStabBranches(InternalException):
-    code = 204
-
-    def __init__(self, branch, other_branch):
-        msg = 'Unsupported multiple stabilization branches ' \
-              'have been detected: %r, %r ' \
-              % (branch, other_branch)
-        super(UnsupportedMultipleStabBranches, self).__init__(msg)
-
-
-class DeprecatedStabilizationBranch(InternalException):
-    code = 205
-
-    def __init__(self, branch, tag):
-        msg = 'Branch %r must be deleted as %r has been created' % (
-            branch, tag)
-        super(DeprecatedStabilizationBranch, self).__init__(msg)
-
-
-class VersionMismatch(InternalException):
-    code = 206
-
-    def __init__(self, dev_branch, stabilization_branch):
-        msg = 'Branch %r (micro==%d) and %r do not match' % (
-            dev_branch.name,
-            dev_branch.micro,
-            stabilization_branch.name)
-        super(VersionMismatch, self).__init__(msg)
-
-
 class UnrecognizedBranchPattern(InternalException):
     code = 207
 

bert_e/jobs/create_branch.py

@@ -19,7 +19,6 @@
 from bert_e.workflow.git_utils import clone_git_repo, push
 from bert_e.workflow.gitwaterflow.branches import (BranchCascade,
                                                    DevelopmentBranch,
-                                                   StabilizationBranch,
                                                    HotfixBranch,
                                                    build_queue_collection,
                                                    branch_factory)
@@ -57,7 +56,6 @@ def create_branch(job: CreateBranchJob):
                                     'GWF branch.' % job.settings.branch)
 
     if not (isinstance(new_branch, DevelopmentBranch) or
-            isinstance(new_branch, StabilizationBranch) or
             isinstance(new_branch, HotfixBranch)):
         raise exceptions.JobFailure('Requested new branch %r is not a GWF '
                                     'destination branch.' % new_branch)
@@ -82,17 +80,7 @@ def create_branch(job: CreateBranchJob):
                                         'branch.' % job.settings.branch_from)
     # ...or determine the branching point automatically
     else:
-        if isinstance(new_branch, StabilizationBranch):
-            job.settings.branch_from = DevelopmentBranch(
-                repo,
-                'development/%s.%s' % (new_branch.major, new_branch.minor))
-
-            if job.settings.branch_from not in dev_branches:
-                raise exceptions.JobFailure('Cannot create a stabilization '
-                                            'branch %r without a supporting '
-                                            'development branch.' %
-                                            new_branch)
-        elif isinstance(new_branch, HotfixBranch):
+        if isinstance(new_branch, HotfixBranch):
             # start from tag X.Y.Z.0
             job.settings.branch_from = new_branch.version + '.0'
         else:
@@ -110,10 +98,7 @@ def create_branch(job: CreateBranchJob):
     # any new conflict.
     #
     # older dev branches can be created if queues are disabled, or empty.
-    #
-    # there are no restrictions for stabilization branches.
     if (job.settings.use_queue and
-            not isinstance(new_branch, StabilizationBranch) and
             not isinstance(new_branch, HotfixBranch) and
             new_branch < dev_branches[-1]):
         queue_collection = build_queue_collection(job)
@@ -140,7 +125,6 @@ def create_branch(job: CreateBranchJob):
                                     'keep pushing.')
 
     if (not job.settings.use_queue or
-            isinstance(new_branch, StabilizationBranch) or
             isinstance(new_branch, HotfixBranch)):
         raise exceptions.JobSuccess()
 

bert_e/jobs/delete_branch.py

@@ -19,7 +19,6 @@
 from bert_e.lib.git import RemoveFailedException
 from bert_e.workflow.git_utils import clone_git_repo
 from bert_e.workflow.gitwaterflow.branches import (DevelopmentBranch,
-                                                   StabilizationBranch,
                                                    HotfixBranch,
                                                    build_queue_collection,
                                                    QueueBranch,
@@ -61,7 +60,6 @@ def delete_branch(job: DeleteBranchJob):
                                     'GWF branch.' % job.settings.branch)
 
     if not (isinstance(del_branch, DevelopmentBranch) or
-            isinstance(del_branch, StabilizationBranch) or
             isinstance(del_branch, HotfixBranch)):
         raise exceptions.JobFailure('Requested branch %r is not a GWF '
                                     'destination branch.' % del_branch)
@@ -78,16 +76,6 @@ def delete_branch(job: DeleteBranchJob):
                                     'repository.' %
                                     (del_branch, del_branch.version))
 
-    # do not allow deleting a dev branch if there is a stab
-    if not isinstance(del_branch, StabilizationBranch) and \
-       not isinstance(del_branch, HotfixBranch):
-        stab_prefix = 'stabilization/%s' % del_branch.version
-        if any([b.startswith(stab_prefix) for b in repo.remote_branches]):
-            raise exceptions.JobFailure('Cannot delete branch %r because '
-                                        'there is an active stabilization '
-                                        'branch in the repository.' %
-                                        del_branch)
-
     if job.settings.use_queue:
         queue_collection = build_queue_collection(job)
         if queue_collection.has_version_queued_prs(del_branch.version_t):

bert_e/server/api/gwf/branches.py

@@ -24,7 +24,7 @@
 from ..base import APIEndpoint, APIForm
 
 
-BRANCH_REGEXP = r'^development/(\d+)\.(\d+)$|^stabilization/(\d+)\.(\d+)\.(\d+)$|^hotfix/(\d+)\.(\d+)\.(\d+)$'  # noqa
+BRANCH_REGEXP = r'^development/(\d+)\.(\d+)$|^hotfix/(\d+)\.(\d+)\.(\d+)$'  # noqa
 BRANCH_FROM_REGEXP = r'^[a-fA-F0-9]*$|^development/(\d+)\.(\d+)$'