From 7709e45f6c77ab55a42fe6c86e0065de53a83693 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Wed, 1 Jul 2026 16:39:00 -0400
Subject: [PATCH 1/3] Run arm64 tests on merge queue and master

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .gitlab-ci.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 83ffc2f91a7..68fee879cac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -753,13 +753,20 @@ muzzle-dep-report:
     GIT_SUBMODULE_STRATEGY: normal
     GIT_SUBMODULE_DEPTH: 1
   rules:
+    # `ibm8`/`oracle8` have no arm64 images published upstream — never run them on arm64.
+    - if: '$testJvm == "ibm8" || $testJvm == "oracle8"'
+      when: never
+    # On the merge queue, run the full matrix (both default and non-default JVMs) on arm64.
+    # (`gh-readonly-queue` needs no handling — the `workflow:` rules skip its pipeline entirely.)
+    - if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/'
+      when: on_success
+    # On master, run the default JVMs automatically (gating).
+    - if: '$CI_COMMIT_BRANCH == "master" && $testJvm =~ $DEFAULT_TEST_JVMS'
+      when: on_success
+    # On merge requests, allow the default JVMs to be triggered manually (non-blocking).
     - if: $testJvm =~ $DEFAULT_TEST_JVMS
       when: manual
       allow_failure: true
-      # Note: `ibm8` and `oracle8` omitted — no arm64 images published upstream.
-    - if: '$NON_DEFAULT_JVMS == "true" && $testJvm != "ibm8" && $testJvm != "oracle8"'
-      when: manual
-      allow_failure: true
   cache:
     - key: dependency-$CACHE_TYPE
       paths:

From a8fbbaeb7fe2a0856ca58ff5e13acfee48f441b1 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Wed, 1 Jul 2026 16:47:45 -0400
Subject: [PATCH 2/3] Accept review notes.

Co-authored-by: Sarah Chen <sarah.chen@datadoghq.com>
---
 .gitlab-ci.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68fee879cac..a31d237a22f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -756,14 +756,10 @@ muzzle-dep-report:
     # `ibm8`/`oracle8` have no arm64 images published upstream — never run them on arm64.
     - if: '$testJvm == "ibm8" || $testJvm == "oracle8"'
       when: never
-    # On the merge queue, run the full matrix (both default and non-default JVMs) on arm64.
-    # (`gh-readonly-queue` needs no handling — the `workflow:` rules skip its pipeline entirely.)
     - if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/'
       when: on_success
-    # On master, run the default JVMs automatically (gating).
-    - if: '$CI_COMMIT_BRANCH == "master" && $testJvm =~ $DEFAULT_TEST_JVMS'
+    - if: '$CI_COMMIT_BRANCH == "master"
       when: on_success
-    # On merge requests, allow the default JVMs to be triggered manually (non-blocking).
     - if: $testJvm =~ $DEFAULT_TEST_JVMS
       when: manual
       allow_failure: true

From 207b1939e47c72b18dccf2075bdd90003c68f573 Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Wed, 1 Jul 2026 18:24:21 -0400
Subject: [PATCH 3/3] Fixed typo.

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a31d237a22f..4d47fc28de1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -758,9 +758,9 @@ muzzle-dep-report:
       when: never
     - if: '$CI_COMMIT_BRANCH =~ /^mq-working-branch-/'
       when: on_success
-    - if: '$CI_COMMIT_BRANCH == "master"
+    - if: '$CI_COMMIT_BRANCH == "master"'
       when: on_success
-    - if: $testJvm =~ $DEFAULT_TEST_JVMS
+    - if: '$testJvm =~ $DEFAULT_TEST_JVMS'
       when: manual
       allow_failure: true
   cache: