From bbe249757b6ae5e9a97e035674a3a93641013f11 Mon Sep 17 00:00:00 2001
From: Stan Ulbrych <stan@ulbrych.org>
Date: Wed, 18 Feb 2026 14:27:49 +0000
Subject: [PATCH 1/3] Add stan-aarch64-ubuntu

---
 master/custom/builders.py  | 4 ++++
 master/custom/factories.py | 6 ++++++
 master/custom/workers.py   | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/master/custom/builders.py b/master/custom/builders.py
index 9a7a4a67..e483e828 100644
--- a/master/custom/builders.py
+++ b/master/custom/builders.py
@@ -1,6 +1,7 @@
 from custom.factories import (
     UnixBuild,
     UnixPerfBuild,
+    UnixXPickleBuild,
     RHEL8Build,
     CentOS9Build,
     FedoraStableBuild,
@@ -208,6 +209,9 @@
     # Ubuntu Linux AArch64
     ("aarch64 Ubuntu 24.04 BigMem", "diegorusso-aarch64-bigmem", UnixBigmemBuild),
 
+    # test_xpickle
+    ("aarch64 Ubuntu test_xpickle", "stan-aarch64-ubuntu", UnixXPickleBuild)
+
     # Linux x86-64 GCC
     # Fedora Rawhide is unstable
     ("AMD64 Fedora Rawhide", "cstratak-fedora-rawhide-x86_64", FedoraRawhideBuild),
diff --git a/master/custom/factories.py b/master/custom/factories.py
index f7e54eec..f82c6ff2 100644
--- a/master/custom/factories.py
+++ b/master/custom/factories.py
@@ -290,6 +290,12 @@ class UnixBigmemBuild(UnixBuild):
     factory_tags = ["bigmem"]
 
 
+class UnixXPickleBuild(UnixBuild):
+    buildersuffix = ".xpickle"
+    testFlags = ["-uxpickle", "test_xpickle"]
+    factory_tags = ["xpickle"]
+
+
 class NonDebugUnixBuild(UnixBuild):
     buildersuffix = ".nondebug"
     # Enable assertions regardless. Some children will override this,
diff --git a/master/custom/workers.py b/master/custom/workers.py
index 8f0e1a89..a79965a6 100644
--- a/master/custom/workers.py
+++ b/master/custom/workers.py
@@ -184,6 +184,11 @@ def get_workers(settings):
                   'aarch32', 'arm'],
             parallel_tests=4,
         ),
+        cpw(
+            name="stan-aarch64-ubuntu",
+            tags=['linux', 'unix', 'ubuntu', 'arm', 'arm64', 'aarch64'],
+            parallel_tests=4,
+        ),
         cpw(
             name="stan-raspbian",
             tags=['linux', 'unix', 'raspbian', 'debian', 'armv8',

From d69df210a5b7d649d8e5ad996f0bed72187357cc Mon Sep 17 00:00:00 2001
From: Stan Ulbrych <stan@ulbrych.org>
Date: Wed, 18 Feb 2026 14:31:28 +0000
Subject: [PATCH 2/3] Fixup

---
 master/custom/builders.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/master/custom/builders.py b/master/custom/builders.py
index e483e828..57054718 100644
--- a/master/custom/builders.py
+++ b/master/custom/builders.py
@@ -210,7 +210,7 @@
     ("aarch64 Ubuntu 24.04 BigMem", "diegorusso-aarch64-bigmem", UnixBigmemBuild),
 
     # test_xpickle
-    ("aarch64 Ubuntu test_xpickle", "stan-aarch64-ubuntu", UnixXPickleBuild)
+    ("aarch64 Ubuntu test_xpickle", "stan-aarch64-ubuntu", UnixXPickleBuild),
 
     # Linux x86-64 GCC
     # Fedora Rawhide is unstable

From c36d7cf8cf0151a0f5eb7b6de0ff23bd5c99d4df Mon Sep 17 00:00:00 2001
From: Stan Ulbrych <stan@ulbrych.org>
Date: Wed, 18 Feb 2026 16:06:18 +0000
Subject: [PATCH 3/3] Exclude old branches

---
 master/custom/workers.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/master/custom/workers.py b/master/custom/workers.py
index a79965a6..4148ea90 100644
--- a/master/custom/workers.py
+++ b/master/custom/workers.py
@@ -188,6 +188,8 @@ def get_workers(settings):
             name="stan-aarch64-ubuntu",
             tags=['linux', 'unix', 'ubuntu', 'arm', 'arm64', 'aarch64'],
             parallel_tests=4,
+            # test_xpickle doesn't exist on these branches
+            not_branches=['3.12', '3.11', '3.10'],
         ),
         cpw(
             name="stan-raspbian",