ubuntu-bugcontrol team mailing list archive
-
ubuntu-bugcontrol team
-
Mailing list archive
-
Message #04786
[Merge] ~alexmurray/ubuntu-qa-tools:unembargo-ignore-devel-point-release-milestones into ubuntu-qa-tools:master
Alex Murray has proposed merging ~alexmurray/ubuntu-qa-tools:unembargo-ignore-devel-point-release-milestones into ubuntu-qa-tools:master.
Commit message:
security-tools/unembargo: ignore point-release milestones for devel
See discussion in
https://chat.canonical.com/canonical/pl/jwmybhjzm7g18yuu56ynzks5zw
Signed-off-by: Alex Murray <alex.murray@xxxxxxxxxxxxx>
Requested reviews:
Ubuntu Bug Control (ubuntu-bugcontrol)
For more details, see:
https://code.launchpad.net/~alexmurray/ubuntu-qa-tools/+git/ubuntu-qa-tools/+merge/480286
--
Your team Ubuntu Bug Control is requested to review the proposed merge of ~alexmurray/ubuntu-qa-tools:unembargo-ignore-devel-point-release-milestones into ubuntu-qa-tools:master.
diff --git a/security-tools/unembargo b/security-tools/unembargo
index e82840d..93ecff8 100755
--- a/security-tools/unembargo
+++ b/security-tools/unembargo
@@ -150,6 +150,21 @@ def pending_milestone(ubuntu, release):
# time
milestone_date = _milestone.date_targeted + datetime.timedelta(days=1)
if now < milestone_date and milestone_date < now + datetime.timedelta(days=MILESTONE_WINDOW):
+ # ignore point release milestones for the devel release as they are
+ # not relevant for security updates
+ # https://chat.canonical.com/canonical/pl/jwmybhjzm7g18yuu56ynzks5zw
+ # actual milestones are named as ubuntu-25.04 or ubuntu-25.04-beta
+ # etc but these point release milestones are named as ubuntu-24.11
+ # or ubuntu-25.01 - so ignore any which don't have a name of
+ # ubuntu-YY.MM where YY.MM is the actual release version
+ milestone_name = _milestone.name
+ release_version = cve_lib.release_version(release)
+ if release_version is None or release_version == 0.0:
+ continue
+ relevant_milestones = 'ubuntu-%.2f' % release_version
+ if release == cve_lib.devel_release and not milestone_name.startswith(relevant_milestones):
+ print("Ignoring irrelevant milestone %s for %s" % (milestone_name, release))
+ continue
milestone = _milestone
break
Follow ups