From 1016a5bf595f62c4ef4854d624669b6c73e31198 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Thu, 27 Feb 2025 18:29:17 +0800
Subject: [PATCH 1/2] Do not hold improvements/new features in CLR

* During the freeze period up to the last week before the release,
improvements and new features in the CLR queue will not be held
(behaviour A1).

Note: Keeping the behaviour for
- A3b (last week before release, all issues unrelated to the
  release will be held)
- B1a (during on-sync period, only bugs will be integrated)
---
 tracker_automations/continuous_manage_queues/lib.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tracker_automations/continuous_manage_queues/lib.sh b/tracker_automations/continuous_manage_queues/lib.sh
index bcfb3454..ff484d56 100755
--- a/tracker_automations/continuous_manage_queues/lib.sh
+++ b/tracker_automations/continuous_manage_queues/lib.sh
@@ -19,12 +19,12 @@ function run_A1() {
     # Note this could be done by one unique "runFromIssueList" action, but we are splitting
     # the search and the update in order to log all the closed issues within jenkins ($logfile)
 
-    # Basically get all the issues in the candidates queues (filter=14000 OR filter=23329), that are not bug
+    # Basically get all the issues in the candidates queues (filter=14000), that are not bug
     # and that haven't received any comment with the standard unholding text (NOT filter = 22054)
 
     # Get the list of issues.
     ${basereq} --action getIssueList \
-               --jql "(filter=14000 OR filter=23329) \
+               --jql "(filter=14000) \
                      AND type IN ('New Feature', Improvement) \
                      AND NOT filter = 22054" \
                --file "${resultfile}"

From b32080e36100068d75ed67e5fa2eb54c09b9bde1 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Thu, 27 Feb 2025 18:30:52 +0800
Subject: [PATCH 2/2] Do not perform CLR triage for improvements/new features
 during freeze

---
 .../component_leads_integration_mover.sh      | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/tracker_automations/component_leads_integration_mover/component_leads_integration_mover.sh b/tracker_automations/component_leads_integration_mover/component_leads_integration_mover.sh
index cccc5da7..5f0ba1d8 100755
--- a/tracker_automations/component_leads_integration_mover/component_leads_integration_mover.sh
+++ b/tracker_automations/component_leads_integration_mover/component_leads_integration_mover.sh
@@ -9,12 +9,13 @@
 #clearcache: set it to "true" to force the removal of the (48h) cached groups, components and reviewers data.
 #quiet: with any value different from "false", don't perform any action in the Tracker.
 #restrictedto: if set, restrict any comment to that role in the project. Blank means visible to everybody.
+#releasedate: Release date, used to calculate the freeze period. Improvements and new features will not be moved to CLR during freeze. YYYY-MM-DD.
 
 # Let's go strict (exit on error)
 set -e
 
 # Verify everything is set
-required="WORKSPACE jiraclicmd jiraserver jirauser jirapass jsonclrurl"
+required="WORKSPACE jiraclicmd jiraserver jirauser jirapass jsonclrurl releasedate"
 for var in $required; do
     if [ -z "${!var}" ]; then
         echo "Error: ${var} environment variable is not defined. See the script comments."
@@ -92,10 +93,26 @@ echo "Using cached (until ${validuntil}) CLR metadata information."
 
 source ${mydir}/lib.sh # Add all the functions.
 
+# Code freeze date calculated 6 weeks before the release date.
+freezedate=$(date -d "${releasedate} -6week" +%Y%m%d)
+
+# On-sync end date calculated 2 weeks after the release date.
+onsyncenddate=$(date -d "${releasedate} +2week" +%Y%m%d)
+
+# Today's date.
+nowdate=$(date +%Y%m%d)
+
+# We'll exclude New Features and Improvements from the CLR process during the freeze period.
+excludequery=""
+if [ "${nowdate}" -ge "${freezedate}" ] && [ "${nowdate}" -lt "${onsyncenddate}" ]; then
+    excludequery="AND issuetype NOT IN ('New Feature', Improvement)"
+    echo "Today (${nowdate}) is within the freeze period (${freezedate} - ${onsyncenddate}). Improvements and new features will not be moved to the CLR queue."
+fi
+
 # Search for all the issues awaiting for integration and not being decided between CLR/IR.
 # Note: customfield_10118 is the peer reviewer custom field.
 ${basereq} --action getIssueList \
-           --jql "filter = 23535" \
+           --jql "filter = 23535 ${excludequery}" \
            --columns="Key,Assignee,Peer reviewer,Components,Security Level,Summary" \
            --outputFormat=4 \
            --outputType=json \