mirror of
https://git.centos.org/centos/centpkg.git
synced 2025-02-23 16:22:55 +00:00
Fix detection of releases in Maintenance Phase
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
parent
7bcd746516
commit
84955b3fea
1 changed files with 8 additions and 3 deletions
|
@ -612,6 +612,7 @@ def determine_rhel_state(
|
||||||
prior_release_branch = format_branch(
|
prior_release_branch = format_branch(
|
||||||
x_version, active_y_version - 1, is_beta=False
|
x_version, active_y_version - 1, is_beta=False
|
||||||
)
|
)
|
||||||
|
current_release_branch = format_branch(x_version, active_y_version, is_beta=False)
|
||||||
|
|
||||||
logger.debug("Prior release branch: {}".format(prior_release_branch))
|
logger.debug("Prior release branch: {}".format(prior_release_branch))
|
||||||
|
|
||||||
|
@ -624,12 +625,16 @@ def determine_rhel_state(
|
||||||
|
|
||||||
if branch_exists:
|
if branch_exists:
|
||||||
# The branch is there, so work on the active Y-stream, which is always
|
# The branch is there, so work on the active Y-stream, which is always
|
||||||
# in DevTestDoc Phase
|
# in either DevTestDoc Phase or Maintenance Phase (in the case of an
|
||||||
phase = pp_phase_devtestdoc
|
# end-of-life CentOS Stream)
|
||||||
|
phase = phase_lookup[current_release_branch]
|
||||||
check_tickets_branch = cs_branch
|
check_tickets_branch = cs_branch
|
||||||
rhel_target_default = "latest"
|
rhel_target_default = "latest"
|
||||||
enforcing = False
|
|
||||||
target_version = latest_version
|
target_version = latest_version
|
||||||
|
if phase == pp_phase_maintenance:
|
||||||
|
enforcing = True
|
||||||
|
else:
|
||||||
|
enforcing = False
|
||||||
else:
|
else:
|
||||||
# The branch is not present, so we'll work on the prior Y-stream
|
# The branch is not present, so we'll work on the prior Y-stream
|
||||||
check_tickets_branch = prior_release_branch
|
check_tickets_branch = prior_release_branch
|
||||||
|
|
Loading…
Add table
Reference in a new issue