From c35b17b74e8af74e59209af9df31d6ef8270091f Mon Sep 17 00:00:00 2001
From: Sergey Zelenov <sergey.zelenov@mongodb.com>
Date: Tue, 5 May 2026 09:49:32 +0200
Subject: [PATCH 1/3] test(NODE-6820): test on Graviton processor

---
 .evergreen/ci_matrix_constants.js      |  4 +++-
 .evergreen/config.yml                  | 13 +++++++++++++
 .evergreen/generate_evergreen_tasks.js | 23 ++++++++++++++++++++++-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/.evergreen/ci_matrix_constants.js b/.evergreen/ci_matrix_constants.js
index 3a349d5849c..1b38ceabefb 100644
--- a/.evergreen/ci_matrix_constants.js
+++ b/.evergreen/ci_matrix_constants.js
@@ -20,6 +20,7 @@ const UBUNTU_OS = 'ubuntu1804-large';
 const UBUNTU_20_OS = 'ubuntu2004-small';
 const UBUNTU_22_OS = 'ubuntu2204-large';
 const DEBIAN_OS = 'debian11-small';
+const GRAVITON_OS = 'amazon2023-arm64-latest-large-m8g';
 
 module.exports = {
   MONGODB_VERSIONS,
@@ -37,5 +38,6 @@ module.exports = {
   UBUNTU_OS,
   UBUNTU_20_OS,
   UBUNTU_22_OS,
-  DEBIAN_OS
+  DEBIAN_OS,
+  GRAVITON_OS
 };
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index d2748818bef..2b6b17ece67 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -4079,3 +4079,16 @@ buildvariants:
       NODE_LTS_VERSION: 24
       CLIENT_ENCRYPTION: true
       MONGODB_BUNDLED: true
+  - name: amazon-linux-2023-arm64-graviton4
+    display_name: Graviton4 AL2023 Node24
+    run_on: amazon2023-arm64-latest-large-m8g
+    expansions:
+      NODE_LTS_VERSION: 24
+      CLIENT_ENCRYPTION: true
+    tasks:
+      - test-latest-server
+      - test-latest-replica_set
+      - test-latest-sharded_cluster
+      - test-latest-server-v1-api
+      - test-zstd-compression
+      - test-snappy-compression
diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js
index a866e26ff07..8684a512dcf 100644
--- a/.evergreen/generate_evergreen_tasks.js
+++ b/.evergreen/generate_evergreen_tasks.js
@@ -17,7 +17,8 @@ const {
   MACOS_OS,
   UBUNTU_20_OS,
   DEBIAN_OS,
-  UBUNTU_22_OS
+  UBUNTU_22_OS,
+  GRAVITON_OS
 } = require('./ci_matrix_constants');
 
 // TODO(NODE-7499): unpin npm version once Node 22 ships a bundled npm that can upgrade itself
@@ -875,6 +876,26 @@ BUILD_VARIANTS.push({
   expansions: nodelessExpansions
 });
 
+const gravitonTasks = [
+  'test-latest-server',
+  'test-latest-replica_set',
+  'test-latest-sharded_cluster',
+  'test-latest-server-v1-api',
+  'test-zstd-compression',
+  'test-snappy-compression',
+];
+
+BUILD_VARIANTS.push({
+  name: 'amazon-linux-2023-arm64-graviton4',
+  display_name: `Graviton4 AL2023 Node${LATEST_LTS}`,
+  run_on: GRAVITON_OS,
+  expansions: {
+    NODE_LTS_VERSION: LATEST_LTS,
+    CLIENT_ENCRYPTION: true,
+  },
+  tasks: gravitonTasks,
+});
+
 // TODO(NODE-4897): Debug socks5 tests on node latest
 for (const variant of BUILD_VARIANTS.filter(
   variant => variant.expansions && ['latest'].includes(variant.expansions.NODE_LTS_VERSION)

From 11cc1d8a2b63709f7c11b577043f5f7051461719 Mon Sep 17 00:00:00 2001
From: Sergey Zelenov <sergey.zelenov@mongodb.com>
Date: Wed, 6 May 2026 13:24:18 +0200
Subject: [PATCH 2/3] chore: fix formatting

---
 .evergreen/generate_evergreen_tasks.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js
index 8684a512dcf..c6ae30e9aaa 100644
--- a/.evergreen/generate_evergreen_tasks.js
+++ b/.evergreen/generate_evergreen_tasks.js
@@ -882,7 +882,7 @@ const gravitonTasks = [
   'test-latest-sharded_cluster',
   'test-latest-server-v1-api',
   'test-zstd-compression',
-  'test-snappy-compression',
+  'test-snappy-compression'
 ];
 
 BUILD_VARIANTS.push({
@@ -891,9 +891,9 @@ BUILD_VARIANTS.push({
   run_on: GRAVITON_OS,
   expansions: {
     NODE_LTS_VERSION: LATEST_LTS,
-    CLIENT_ENCRYPTION: true,
+    CLIENT_ENCRYPTION: true
   },
-  tasks: gravitonTasks,
+  tasks: gravitonTasks
 });
 
 // TODO(NODE-4897): Debug socks5 tests on node latest

From 9a1e12cda41f7210173a0f944679f1719d0f436a Mon Sep 17 00:00:00 2001
From: Sergey Zelenov <sergey.zelenov@mongodb.com>
Date: Fri, 8 May 2026 16:12:59 +0200
Subject: [PATCH 3/3] add TEST_CSFLE flag to force test run

---
 .evergreen/config.yml                  | 1 +
 .evergreen/generate_evergreen_tasks.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index ca7db7ac6e4..5f9e7fc9333 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -4085,6 +4085,7 @@ buildvariants:
     expansions:
       NODE_LTS_VERSION: 24
       CLIENT_ENCRYPTION: true
+      TEST_CSFLE: true
     tasks:
       - test-latest-server
       - test-latest-replica_set
diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js
index c6ae30e9aaa..1ff51ef840c 100644
--- a/.evergreen/generate_evergreen_tasks.js
+++ b/.evergreen/generate_evergreen_tasks.js
@@ -891,7 +891,8 @@ BUILD_VARIANTS.push({
   run_on: GRAVITON_OS,
   expansions: {
     NODE_LTS_VERSION: LATEST_LTS,
-    CLIENT_ENCRYPTION: true
+    CLIENT_ENCRYPTION: true,
+    TEST_CSFLE: true
   },
   tasks: gravitonTasks
 });