From e0a676e1f03a833036a0917879bf4e095ade77d3 Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Fri, 8 Nov 2024 11:05:02 +0800
Subject: [PATCH] Check automated test results field is empty before launching
 builds

---
 .../criteria/awaiting_component_lead_review/query.sh          | 1 +
 .../criteria/awaiting_integration/query.sh                    | 1 +
 .../mv_reopened_out_from_current.sh                           | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_component_lead_review/query.sh b/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_component_lead_review/query.sh
index 038e1397..4949f5e8 100755
--- a/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_component_lead_review/query.sh
+++ b/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_component_lead_review/query.sh
@@ -3,6 +3,7 @@ ${basereq} --action getIssueList \
                  AND status = 'Waiting for component lead review' \
                  AND status WAS NOT 'Waiting for component lead review' ON '-${schedulemins}' \
                  AND level IS EMPTY \
+                 AND 'Automated test results' IS EMPTY \
                  ORDER BY priority DESC, votes DESC, 'Last comment date' ASC" \
            --outputFormat 101 \
            --file "${resultfile}"
diff --git a/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_integration/query.sh b/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_integration/query.sh
index e21e509d..2d39b7ef 100755
--- a/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_integration/query.sh
+++ b/tracker_automations/bulk_prelaunch_jobs/criteria/awaiting_integration/query.sh
@@ -3,6 +3,7 @@ ${basereq} --action getIssueList \
                  AND status = 'Waiting for integration review' \
                  AND status WAS NOT 'Waiting for integration review' ON '-${schedulemins}' \
                  AND level IS EMPTY \
+                 AND 'Automated test results' IS EMPTY \
                  ORDER BY priority DESC, votes DESC, 'Last comment date' ASC" \
            --outputFormat 101 \
            --file "${resultfile}"
diff --git a/tracker_automations/mv_reopened_out_from_current/mv_reopened_out_from_current.sh b/tracker_automations/mv_reopened_out_from_current/mv_reopened_out_from_current.sh
index fa961475..bb646a19 100755
--- a/tracker_automations/mv_reopened_out_from_current/mv_reopened_out_from_current.sh
+++ b/tracker_automations/mv_reopened_out_from_current/mv_reopened_out_from_current.sh
@@ -74,11 +74,15 @@ while read line; do
     #    --issue ${issue} \
     #    --field "customfield_10211=" \
     #    --comment "Moving this reopened issue out from current integration. Please, re-submit it for integration once ready."
+    #
+    # Note: customfield_10211 represents the "Currently in integration" field, and customfield_17112 represents
+    # the "Automated test results" field.
     ${basereq} --action transitionIssue \
         --issue ${issue} \
         --transition "CI Global Self-Transition" \
         --fixVersions "${keepversion}" \
         --field "customfield_10211=" \
+        --field "customfield_17112=" \
         --comment "Moving this reopened issue out from current integration. Please, re-submit it for integration once ready."
     echo "$BUILD_NUMBER $BUILD_TIMESTAMP ${issue}" >> "${logfile}"
 done < "${resultfile}"