This is an automated email from the ASF dual-hosted git repository.
knaufk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-jira-bot.git
The following commit(s) were added to refs/heads/master by this push:
new bc37608 [hotfix] dont warn on tickets that already have the warning
label
new ee516a3 Merge pull request #22 from knaufk/hotfix-blocker-issues
bc37608 is described below
commit bc376084c6c76a4d0fd578e526d2930977461e54
Author: Konstantin Knauf <[email protected]>
AuthorDate: Fri Jul 9 12:26:05 2021 +0200
[hotfix] dont warn on tickets that already have the warning label
---
stale_assigned_rule.py | 2 +-
stale_major_or_above_rule.py | 3 ++-
stale_minor_rule.py | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/stale_assigned_rule.py b/stale_assigned_rule.py
index dd87598..ecbc3d3 100644
--- a/stale_assigned_rule.py
+++ b/stale_assigned_rule.py
@@ -37,7 +37,7 @@ class StaleAssignedRule(FlinkJiraRule):
)
self.mark_stale_tickets_stale(
f"project = FLINK AND resolution = Unresolved AND assignee is not
EMPTY "
- f"AND updated < startOfDay(-{self.stale_days}d)"
+ f'AND updated < startOfDay(-{self.stale_days}d) AND NOT labels in
("{self.warning_label}")'
)
def handle_stale_ticket(self, key, warning_label, done_label, comment):
diff --git a/stale_major_or_above_rule.py b/stale_major_or_above_rule.py
index c309f17..c0f8123 100644
--- a/stale_major_or_above_rule.py
+++ b/stale_major_or_above_rule.py
@@ -43,7 +43,8 @@ class StaleMajorOrAboveRule(FlinkJiraRule):
)
self.mark_stale_tickets_stale(
f'project=FLINK AND type != "Sub-Task" AND priority =
{self.priority} AND resolution = Unresolved '
- f"AND assignee is empty AND updated <
startOfDay(-{self.stale_days}d) AND fixVersion = null"
+ f'AND assignee is empty AND updated <
startOfDay(-{self.stale_days}d) AND fixVersion = null AND NOT labels '
+ f'in ("{self.warning_label}")'
)
def handle_stale_ticket(self, key, warning_label, done_label, comment):
diff --git a/stale_minor_rule.py b/stale_minor_rule.py
index 4056219..35e9c49 100644
--- a/stale_minor_rule.py
+++ b/stale_minor_rule.py
@@ -39,7 +39,8 @@ class StaleMinorRule(FlinkJiraRule):
)
self.mark_stale_tickets_stale(
f'project = FLINK AND type != "Sub-Task" AND Priority = Minor AND
resolution = Unresolved '
- f"AND updated < startOfDay(-{self.stale_days}d) AND fixVersion =
null"
+ f'AND updated < startOfDay(-{self.stale_days}d) AND fixVersion =
null AND NOT labels in '
+ f'("{self.warning_label}")'
)
def handle_stale_ticket(self, key, warning_label, done_label, comment):
