From e2c8bab35e1ccadfecb23fa125a4f4cc5a6dcee8 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Fri, 31 Aug 2018 10:30:10 -0400 Subject: [PATCH] have list-deliverables --no-stable-branch skip tempest repos Tempest and its plugins do not branch, so we should not list them when asking which repos have not yet branched. Change-Id: I1ebc933b613d8e267392aa8931252f762ad338fa Signed-off-by: Doug Hellmann --- openstack_releases/cmds/list_deliverables.py | 4 ++++ openstack_releases/deliverable.py | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/openstack_releases/cmds/list_deliverables.py b/openstack_releases/cmds/list_deliverables.py index a61eb7036e..37bda8207a 100644 --- a/openstack_releases/cmds/list_deliverables.py +++ b/openstack_releases/cmds/list_deliverables.py @@ -199,6 +199,10 @@ def main(): if args.type and deliv.type not in args.type: continue if args.no_stable_branch: + if deliv.is_branchless: + continue + if deliv.name == 'release-test': + continue if deliv.get_branch_location('stable/' + series) is not None: continue if args.unreleased and (deliv.is_released or not deliv.is_releasable): diff --git a/openstack_releases/deliverable.py b/openstack_releases/deliverable.py index 76062e081b..54a27656a4 100644 --- a/openstack_releases/deliverable.py +++ b/openstack_releases/deliverable.py @@ -477,6 +477,15 @@ class Deliverable(object): def is_milestone_based(self): return self.model == 'cycle-with-milestones' + @property + def is_branchless(self): + # Tempest plugins do not branch. + if self.type == 'tempest-plugin': + return True + if self.name == 'tempest': + return True + return False + @property def type(self): if 'tempest-plugin' in self.name: