Fixes #2005

Author: okorach-sonar

cli/housekeeper.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 #
 # sonar-tools
 # Copyright (C) 2019-2025 Olivier Korach
@@ -124,6 +123,12 @@ def _parse_arguments() -> object:
         default=_DEFAULT_BRANCH_OBSOLESCENCE,
         help=f"Deletes branches not to be kept and not analyzed since a given number of days, by default {_DEFAULT_BRANCH_OBSOLESCENCE} days",
     )
+    parser.add_argument(
+        "--keepWhenInactive",
+        required=False,
+        type=str,
+        help=f"Regexp of branches to keep when inactive, overrides the SonarQube default sonar.dbcleaner.branchesToKeepWhenInactive value",
+    )
     parser.add_argument(
         "-R",
         "--pullrequestsMaxAge",
@@ -195,12 +200,13 @@ def main() -> None:
         sq.verify_connection()
         sq.set_user_agent(f"{TOOL_NAME} {version.PACKAGE_VERSION}")
 
-        mode, proj_age, branch_age, pr_age, token_age = (
+        mode, proj_age, branch_age, pr_age, token_age, keep_regexp = (
             kwargs["mode"],
             kwargs["projectsMaxAge"],
             kwargs["branchesMaxAge"],
             kwargs["pullrequestsMaxAge"],
             kwargs["tokensMaxAge"],
+            kwargs.get("keepWhenInactive", None),
         )
         settings = {
             "audit.tokens.maxAge": token_age,
@@ -209,6 +215,7 @@ def main() -> None:
             PROJ_MAX_AGE: proj_age,
             "audit.projects.branches.maxLastAnalysisAge": branch_age,
             "audit.projects.pullRequests.maxLastAnalysisAge": pr_age,
+            "audit.projects.branches.keepWhenInactive": keep_regexp,
             c.AUDIT_MODE_PARAM: "housekeeper",
             options.NBR_THREADS: kwargs[options.NBR_THREADS],
         }

sonar/branches.py

@@ -361,15 +361,20 @@ def __audit_never_analyzed(self) -> list[Problem]:
 
     def __audit_last_analysis(self, audit_settings: types.ConfigSettings) -> list[Problem]:
         if self.is_main():
-            log.debug("%s is main (not purgeable)", str(self))
+            log.info("%s is main (not purgeable)", str(self))
             return []
         if (age := util.age(self.last_analysis())) is None:
             log.debug("%s last analysis audit is disabled, skipped...", str(self))
             return []
         max_age = audit_settings.get("audit.projects.branches.maxLastAnalysisAge", 30)
+        preserved = audit_settings.get("audit.projects.branches.keepWhenInactive", None)
         problems = []
-        if self.is_kept_when_inactive():
-            log.debug("%s is kept when inactive (not purgeable)", str(self))
+        log.info("EVALUATING %s age %d greater than %d days and not matches '%s'", str(self), age, max_age, preserved)
+        if preserved is not None and age > max_age and not re.match(rf"^{preserved}$", self.name):
+            log.info("%s age %d greater than %d days and not matches '%s'", str(self), age, max_age, preserved)
+            problems.append(Problem(get_rule(RuleId.BRANCH_LAST_ANALYSIS), self, str(self), age))
+        elif self.is_kept_when_inactive():
+            log.info("%s is kept when inactive (not purgeable)", str(self))
         elif age > max_age:
             problems.append(Problem(get_rule(RuleId.BRANCH_LAST_ANALYSIS), self, str(self), age))
         else: