Add current version to list of fixver

Author: matthiasL-scality

bert_e/tests/test_bert_e.py

@@ -460,7 +460,7 @@ def test_branch_cascade_target_three_digit_dev(self):
             4: {'name': 'development/10.0', 'ignore': False}
         })
         tags = ['4.3.14', '4.3.16', '5.1.3']
-        fixver = ['4.3.18', '5.1.4', '10.0.0']
+        fixver = ['4.3.17', '4.3.18', '5.1.4', '10.0.0']
         self.finalize_cascade(branches, tags, destination, fixver)
 
     def test_branch_cascade_with_two_three_digit_dev(self):
@@ -475,7 +475,7 @@ def test_branch_cascade_with_two_three_digit_dev(self):
             6: {'name': 'development/10.0', 'ignore': False}
         })
         tags = ['4.3.14', '4.3.16', '5.1.3']
-        fixver = ['4.3.18', '5.1.2', '5.1.4', '10.0.0']
+        fixver = ['4.3.17', '4.3.18', '5.1.2', '5.1.4', '10.0.0']
         self.finalize_cascade(branches, tags, destination, fixver)
 
     def test_branch_cascade_with_three_digit_dev_and_hf(self):

bert_e/workflow/gitwaterflow/branches.py

@@ -1083,12 +1083,18 @@ def _set_target_versions(self, dst_branch):
                     elif getattr(dev_branch, 'micro', None) is not None:
                         # If this is a three-digit branch
                         # Next micro is micro+1
+                        version_current = '%d.%d.%d' % (
+                            dev_branch.major, dev_branch.minor,
+                            dev_branch.micro)
+                        self.target_versions.append(version_current)
                         next_micro = dev_branch.micro + 1
                     else:
                         next_micro = 0
+
                     version_str = '%d.%d.%d' % (
                         dev_branch.major, dev_branch.minor, next_micro
                     )
+
                     if version_str not in self.target_versions:
                         self.target_versions.append(version_str)
                 else: