From b36442bcd8514b6dc16f32bb605f2c4a866fd8aa Mon Sep 17 00:00:00 2001
From: MyroTk <44327070+MyroTk@users.noreply.github.com>
Date: Wed, 8 Jul 2026 22:45:03 -0400
Subject: [PATCH 1/3] Force ARM builds

---
 ci/jobs/scripts/workflow_hooks/filter_job.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ci/jobs/scripts/workflow_hooks/filter_job.py b/ci/jobs/scripts/workflow_hooks/filter_job.py
index 97e6ea6799a8..7e7cc36defc2 100644
--- a/ci/jobs/scripts/workflow_hooks/filter_job.py
+++ b/ci/jobs/scripts/workflow_hooks/filter_job.py
@@ -48,6 +48,22 @@ def only_docs(changed_files):
 
 _info_cache = None
 
+DOCKER_REQUIRED_ARM_JOBS = {
+    "Build (arm_release)",
+    Settings.DOCKER_BUILD_ARM_LINUX_JOB_NAME,
+    Settings.DOCKER_BUILD_MANIFEST_JOB_NAME,
+}
+
+
+def is_ci_excluded_by_tag(job_name, tag):
+    if tag in ("aarch64", "arm") and job_name in DOCKER_REQUIRED_ARM_JOBS:
+        return False
+
+    return tag in job_name.lower()
+
+
+# Must match ci.workflows.pull_request.KEEPER_STRESS_PR_NAME
+KEEPER_STRESS_PR_NAME = "Keeper Stress Tests (PR)"
 
 def should_skip_job(job_name):
     global _info_cache

From e343b936becc0ec923eba791c4688f4d38029de3 Mon Sep 17 00:00:00 2001
From: MyroTk <44327070+MyroTk@users.noreply.github.com>
Date: Thu, 9 Jul 2026 10:53:13 -0400
Subject: [PATCH 2/3] Update filter_job.py

---
 ci/jobs/scripts/workflow_hooks/filter_job.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/jobs/scripts/workflow_hooks/filter_job.py b/ci/jobs/scripts/workflow_hooks/filter_job.py
index 7e7cc36defc2..04c56108aa41 100644
--- a/ci/jobs/scripts/workflow_hooks/filter_job.py
+++ b/ci/jobs/scripts/workflow_hooks/filter_job.py
@@ -6,6 +6,7 @@
 )
 from ci.jobs.scripts.workflow_hooks.pr_description import Labels
 from ci.praktika.info import Info
+from ci.praktika.settings import Settings
 
 
 def only_docs(changed_files):

From eeb269d9e8f9cef544cfbc7e92fcaf48eaf80012 Mon Sep 17 00:00:00 2001
From: MyroTk <44327070+MyroTk@users.noreply.github.com>
Date: Thu, 9 Jul 2026 17:02:17 -0400
Subject: [PATCH 3/3] Fix filtering for skipped jobs

---
 ci/jobs/scripts/workflow_hooks/filter_job.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ci/jobs/scripts/workflow_hooks/filter_job.py b/ci/jobs/scripts/workflow_hooks/filter_job.py
index 04c56108aa41..650b91aaf21d 100644
--- a/ci/jobs/scripts/workflow_hooks/filter_job.py
+++ b/ci/jobs/scripts/workflow_hooks/filter_job.py
@@ -63,9 +63,6 @@ def is_ci_excluded_by_tag(job_name, tag):
     return tag in job_name.lower()
 
 
-# Must match ci.workflows.pull_request.KEEPER_STRESS_PR_NAME
-KEEPER_STRESS_PR_NAME = "Keeper Stress Tests (PR)"
-
 def should_skip_job(job_name):
     global _info_cache
     if _info_cache is None:
@@ -195,7 +192,7 @@ def should_skip_job(job_name):
 
     ci_exclude_tags = _info_cache.get_kv_data("ci_exclude_tags") or []
     for tag in ci_exclude_tags:
-        if tag in job_name:
+        if is_ci_excluded_by_tag(job_name, tag):
             return True, f"Skipped, job name includes excluded tag '{tag}'"
 
     return False, ""