]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
backport-resolve-issue: recognize that Target version is populated
authorNathan Cutler <ncutler@suse.com>
Wed, 30 Oct 2019 10:44:56 +0000 (11:44 +0100)
committerNathan Cutler <ncutler@suse.com>
Wed, 30 Oct 2019 10:46:24 +0000 (11:46 +0100)
Due to a regression, the script stopped recognizing that a Backport tracker
issue's "Target version" field is populated.

Fixes: af43b3cc3b05e70ec248ad5c23da6fbd4c2e78a1
Signed-off-by: Nathan Cutler <ncutler@suse.com>
src/script/backport-resolve-issue

index ee4ff7684efc6e1d94049d92b81ab06359ba33c7..c5df15f1f48fc65c3c8345b0ce8c6245a545e60b 100755 (executable)
@@ -175,13 +175,6 @@ def get_project(r, p_id):
         project_id2project[p_id] = p_obj
     return project_id2project[p_id]
 
-def get_tracker_target_version(redmine_issue):
-    if redmine_issue.fixed_version:
-        logging.debug("Target version: ID {}, name {}"
-                      .format(self.redmine_issue.fixed_version.id, self.redmine_issue.fixed_version.name))
-        return self.redmine_issue.fixed_version.name
-    return None
-
 def has_tracker(r, p_id, tracker_name):
     for tracker in get_project(r, p_id).trackers:
         if tracker['name'] == tracker_name:
@@ -431,7 +424,7 @@ Ceph version:     base {}, target {}'''.format(self.github_url, pr_title_trunc,
             #
             # is the Backport Tracker's "Target version" custom field populated?
             try:
-                ttv = self.get_tracker_target_version(bt.redmine_issue)
+                ttv = bt.get_tracker_target_version()
             except:
                 logging.info("Backport Tracker {} target version not populated yet!"
                              .format(bt.issue_id))
@@ -535,6 +528,13 @@ class BackportTracker(Backport):
         self.issue_id = issue_id
         self.parent = backport_obj
 
+    def get_tracker_target_version(self):
+        if self.redmine_issue.fixed_version:
+            logging.debug("Target version: ID {}, name {}"
+                          .format(self.redmine_issue.fixed_version.id, self.redmine_issue.fixed_version.name))
+            return self.redmine_issue.fixed_version.name
+        return None
+
     def issue_url(self):
         return "{}/issues/{}".format(redmine_endpoint, self.issue_id)