From c3245411dcfb6e8ccd467e94d9e69bc257861af1 Mon Sep 17 00:00:00 2001
From: starr-openai <starr@openai.com>
Date: Fri, 29 May 2026 08:36:41 -0700
Subject: [PATCH] Retry unstable full CI arm platform

---
 .github/workflows/rust-ci-full.yml            | 20 ++++++++++++++++++-
 .../core/src/session/tests/guardian_tests.rs  |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/rust-ci-full.yml b/.github/workflows/rust-ci-full.yml
index 60d508b21d..084e663bfd 100644
--- a/.github/workflows/rust-ci-full.yml
+++ b/.github/workflows/rust-ci-full.yml
@@ -489,6 +489,7 @@ jobs:
 
   tests_linux_arm64:
     name: Tests — ubuntu-24.04-arm - aarch64-unknown-linux-gnu
+    continue-on-error: true
     uses: ./.github/workflows/rust-ci-full-nextest-platform.yml
     with:
       runner: ubuntu-24.04-arm
@@ -500,6 +501,21 @@ jobs:
       use_sccache: true
     secrets: inherit
 
+  tests_linux_arm64_retry:
+    name: Tests — ubuntu-24.04-arm - aarch64-unknown-linux-gnu (retry)
+    needs: tests_linux_arm64
+    if: always() && needs.tests_linux_arm64.result != 'success'
+    uses: ./.github/workflows/rust-ci-full-nextest-platform.yml
+    with:
+      runner: ubuntu-24.04-arm
+      runner_group: codex-runners
+      runner_labels: codex-linux-arm64
+      target: aarch64-unknown-linux-gnu
+      profile: ci-test
+      artifact_id: linux-arm64-retry
+      use_sccache: true
+    secrets: inherit
+
   tests_windows_x64:
     name: Tests — windows-x64 - x86_64-pc-windows-msvc
     uses: ./.github/workflows/rust-ci-full-nextest-platform.yml
@@ -543,6 +559,7 @@ jobs:
         tests_macos_aarch64,
         tests_linux_x64_remote,
         tests_linux_arm64,
+        tests_linux_arm64_retry,
         tests_windows_x64,
         tests_windows_arm64,
       ]
@@ -560,6 +577,7 @@ jobs:
           echo "test macos : ${{ needs.tests_macos_aarch64.result }}"
           echo "test linux : ${{ needs.tests_linux_x64_remote.result }}"
           echo "test arm64 : ${{ needs.tests_linux_arm64.result }}"
+          echo "test arm64 retry: ${{ needs.tests_linux_arm64_retry.result }}"
           echo "test winx64: ${{ needs.tests_windows_x64.result }}"
           echo "test winarm: ${{ needs.tests_windows_arm64.result }}"
           [[ '${{ needs.argument_comment_lint_package.result }}' == 'success' ]] || { echo 'argument_comment_lint_package failed'; exit 1; }
@@ -569,7 +587,7 @@ jobs:
           [[ '${{ needs.lint_build.result }}' == 'success' ]] || { echo 'lint_build failed'; exit 1; }
           [[ '${{ needs.tests_macos_aarch64.result }}' == 'success' ]] || { echo 'tests_macos_aarch64 failed'; exit 1; }
           [[ '${{ needs.tests_linux_x64_remote.result }}' == 'success' ]] || { echo 'tests_linux_x64_remote failed'; exit 1; }
-          [[ '${{ needs.tests_linux_arm64.result }}' == 'success' ]] || { echo 'tests_linux_arm64 failed'; exit 1; }
+          [[ '${{ needs.tests_linux_arm64.result }}' == 'success' || '${{ needs.tests_linux_arm64_retry.result }}' == 'success' ]] || { echo 'tests_linux_arm64 failed'; exit 1; }
           [[ '${{ needs.tests_windows_x64.result }}' == 'success' ]] || { echo 'tests_windows_x64 failed'; exit 1; }
           [[ '${{ needs.tests_windows_arm64.result }}' == 'success' ]] || { echo 'tests_windows_arm64 failed'; exit 1; }
 
diff --git a/codex-rs/core/src/session/tests/guardian_tests.rs b/codex-rs/core/src/session/tests/guardian_tests.rs
index dabf9c360e..374d6bc0df 100644
--- a/codex-rs/core/src/session/tests/guardian_tests.rs
+++ b/codex-rs/core/src/session/tests/guardian_tests.rs
@@ -426,7 +426,7 @@ async fn strict_auto_review_turn_grant_forces_guardian_for_shell_command_policy_
                     "command": "echo hi",
                     "login": false,
                     "workdir": workdir,
-                    "timeout_ms": 1_000_u64,
+                    "timeout_ms": 10_000_u64,
                 })
                 .to_string(),
             },