From 5701eea4412a9171c223b1b698913491eafc2115 Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Fri, 21 Oct 2022 11:20:00 -0500
Subject: [PATCH] Update select_release_end_date() to work cross release
Currently the event name is limited to 'x-final', this doesn't
work for current releases. Update that to determine the correct
tag.
Change-Id: I14a2d71a0bc26c837ebe4dfebbcfc9b05f02b069
---
openstack_election/cmds/setup_election_config.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/openstack_election/cmds/setup_election_config.py b/openstack_election/cmds/setup_election_config.py
index 1872f4b6..0572638d 100755
--- a/openstack_election/cmds/setup_election_config.py
+++ b/openstack_election/cmds/setup_election_config.py
@@ -97,10 +97,11 @@ def validate_tc_charter(election_type, release_schedule,
exit(1)
-def select_release_end_date(release_schedule):
+def select_release_end_date(release_name, release_schedule):
date = None
+ event = '%s-final' % (release_name[0:1])
for week in release_schedule.get('cycle', []):
- if 'x-final' in week.get('x-project', {}):
+ if event in week.get('x-project', []):
date = datetime.datetime.strptime(
week['end'],
"%Y-%m-%d").replace(tzinfo=pytz.UTC)
@@ -139,7 +140,7 @@ def main():
# select the release end date.
if (args.date is None):
schedule = utils.get_schedule_data(names[idx+1])
- args.date = select_release_end_date(schedule)
+ args.date = select_release_end_date(names[idx+1], schedule)
if args.date is None:
print("Error: no end date found in series data")
exit(1)