Merge pull request #52838 from zztaki/fix-backport-resolve-issue

script/backport-resolve-issue: fix script to handle RC versions
This commit is contained in:
Laura Flores 2023-08-07 18:18:17 -05:00 committed by GitHub
commit d79e61895a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -522,7 +522,10 @@ Ceph version: base {}, target {}'''
maybe_stable = "v{}.{}".format(x, y)
assert ver_to_release()[maybe_stable], \
"SHA1 {} is not based on any known stable release ({})".format(sha1, maybe_stable)
tv = "v{}.{}.{}".format(x, y, int(z) + 1)
if int(y) == 0:
tv = "v{}.{}.{}".format(x, 1, z)
else:
tv = "v{}.{}.{}".format(x, y, int(z) + 1)
if tv in version2version_id:
self.target_version = tv
else: