mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

danger: support partial backport label

Browse Source 
Treat the Backport::Partial label as a backport as well.
This commit is contained in:
Tom Krizek
2022-12-15 17:39:58 +01:00
parent 94f2da42e0
commit 1c0c1ba8b9
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dangerfile.py
View File

@@ -46,7 +46,8 @@ release_notes_regex = re.compile(r"doc/(arm|notes)/notes-.*\.(rst|xml)")
modified_files = danger.git.modified_files modified_files = danger.git.modified_files
mr_labels = danger.gitlab.mr.labels mr_labels = danger.gitlab.mr.labels
target_branch = danger.gitlab.mr.target_branch target_branch = danger.gitlab.mr.target_branch
backport_label_set = "Backport" in mr_labels is_backport = "Backport" in mr_labels or "Backport::Partial" in mr_labels
is_full_backport = is_backport and "Backport::Partial" not in mr_labels
gl = gitlab.Gitlab( gl = gitlab.Gitlab(
url=f"https://{os.environ['CI_SERVER_HOST']}", url=f"https://{os.environ['CI_SERVER_HOST']}",
@@ -140,7 +141,7 @@ for commit in danger.git.commits:
f"Line too long in log message for commit {commit.sha}: " f"Line too long in log message for commit {commit.sha}: "
f"```{line}``` ({len(line)} > 72 characters)." f"```{line}``` ({len(line)} > 72 characters)."
) )
if backport_label_set and "cherry picked from commit" not in commit.message: if is_backport and "cherry picked from commit" not in commit.message:
warn( warn(
f"`cherry picked from commit...` message missing in commit {commit.sha}. " f"`cherry picked from commit...` message missing in commit {commit.sha}. "
"Please use `-x` option with `git cherry-pick` or remove the `Backport` label." "Please use `-x` option with `git cherry-pick` or remove the `Backport` label."
@@ -156,28 +157,28 @@ if not danger.gitlab.mr.milestone:
fail("Please assign this merge request to a milestone.") fail("Please assign this merge request to a milestone.")
############################################################################### ###############################################################################
# VERSION LABELS # BACKPORT & VERSION LABELS
############################################################################### ###############################################################################
# #
# FAIL if any of the following is true for the merge request: # FAIL if any of the following is true for the merge request:
# #
# * The "Backport" label is set and the number of version labels set is # * The MR is marked as Backport and the number of version labels set is
# different than 1. (For backports, the version label is used for indicating # different than 1. (For backports, the version label is used for indicating
# its target branch. This is a rather ugly attempt to address a UI # its target branch. This is a rather ugly attempt to address a UI
# deficiency - the target branch for each MR is not visible on milestone # deficiency - the target branch for each MR is not visible on milestone
# dashboards.) # dashboards.)
# #
# * Neither the "Backport" label nor any version label is set. (If the merge # * The MR is not marked as "Backport" nor any version label is set. (If the
# request is not a backport, version labels are used for indicating # merge request is not a backport, version labels are used for indicating
# backporting preferences.) # backporting preferences.)
version_labels = [l for l in mr_labels if l.startswith("v9.")] version_labels = [l for l in mr_labels if l.startswith("v9.")]
if backport_label_set and len(version_labels) != 1: if is_backport and len(version_labels) != 1:
fail( fail(
"The *Backport* label is set for this merge request. " "This MR was marked as *Backport*. "
"Please also set exactly one version label (*v9.x*)." "Please also set exactly one version label (*v9.x*)."
) )
if not backport_label_set and not version_labels: if not is_backport and not version_labels:
fail( fail(
"If this merge request is a backport, set the *Backport* label and " "If this merge request is a backport, set the *Backport* label and "
"a single version label (*v9.x*) indicating the target branch. " "a single version label (*v9.x*) indicating the target branch. "