[pull] main from MetaMask:main

.github/workflows/ci.yml

@@ -172,6 +172,7 @@ jobs:
     secrets: inherit
 
   e2e-smoke-tests-android:
+    name: "E2E Smoke Tests (Android)"
     permissions:
       contents: read
       id-token: write

.github/workflows/run-e2e-smoke-tests-android.yml

@@ -9,84 +9,138 @@ permissions:
 
 jobs:
   smoke-confirmations-android:
-    name: "Confirmations Smoke (Android)"
+    name: "Confirmations Smoke (Android) - ${{ matrix.split }}"
+    strategy:
+      matrix:
+        split: [1, 2, 3]
+      fail-fast: false
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
-      test-suite-name: smoke-confirmations-android
+      test-suite-name: smoke-confirmations-android-${{ matrix.split }}
       platform: android
-      test_suite_tag: ".*SmokeConfirmations.*"
+      test_suite_tag: "SmokeConfirmations"
+      split_number: ${{ matrix.split }}
+      total_splits: 3
     secrets: inherit
 
   smoke-trade-android:
-    name: "Trade Smoke (Android)"
+    name: "Trade Smoke (Android) - ${{ matrix.split }}"
+    strategy:
+      matrix:
+        split: [1, 2]
+      fail-fast: false
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
-      test-suite-name: smoke-trade-android
+      test-suite-name: smoke-trade-android-${{ matrix.split }}
       platform: android
-      test_suite_tag: ".*SmokeTrade.*"
+      test_suite_tag: "SmokeTrade"
+      split_number: ${{ matrix.split }}
+      total_splits: 2
     secrets: inherit
 
   smoke-wallet-platform-android:
-    name: "Wallet Platform Smoke (Android)"
+    name: "Wallet Platform Smoke (Android) - ${{ matrix.split }}"
+    strategy:
+      matrix:
+        split: [1, 2]
+      fail-fast: false
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
-      test-suite-name: smoke-wallet-platform-android
+      test-suite-name: smoke-wallet-platform-android-${{ matrix.split }}
       platform: android
-      test_suite_tag: ".*SmokeWalletPlatform.*"
+      test_suite_tag: "SmokeWalletPlatform"
+      split_number: ${{ matrix.split }}
+      total_splits: 2
     secrets: inherit
 
   smoke-identity-android:
-    name: "Identity Smoke (Android)"
+    name: "Identity Smoke (Android) - ${{ matrix.split }}"
+    strategy:
+      matrix:
+        split: [1, 2]
+      fail-fast: false
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
-      test-suite-name: smoke-identity-android
+      test-suite-name: smoke-identity-android-${{ matrix.split }}
       platform: android
-      test_suite_tag: ".*SmokeIdentity.*"
+      test_suite_tag: "SmokeIdentity"
+      split_number: ${{ matrix.split }}
+      total_splits: 2
     secrets: inherit
 
   smoke-accounts-android:
-    name: "Accounts Smoke (Android)"
+    name: "Accounts Smoke (Android) - ${{ matrix.split }}"
+    strategy:
+      matrix:
+        split: [1, 2]
+      fail-fast: false
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
-      test-suite-name: smoke-accounts-android
+      test-suite-name: smoke-accounts-android-${{ matrix.split }}
       platform: android
-      test_suite_tag: ".*SmokeAccounts.*"
+      test_suite_tag: "SmokeAccounts"
+      split_number: ${{ matrix.split }}
+      total_splits: 2
     secrets: inherit
 
   smoke-network-abstraction-android:
-    name: "Network Abstraction Smoke (Android)"
+    name: "Network Abstraction Smoke (Android) - ${{ matrix.split }}"
+    strategy:
+      matrix:
+        split: [1, 2]
+      fail-fast: false
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
-      test-suite-name: smoke-network-abstraction-android
+      test-suite-name: smoke-network-abstraction-android-${{ matrix.split }}
       platform: android
-      test_suite_tag: ".*SmokeNetworkAbstraction.*"
+      test_suite_tag: "SmokeNetworkAbstractions"
+      split_number: ${{ matrix.split }}
+      total_splits: 2
     secrets: inherit
 
   smoke-network-expansion-android:
-    name: "Network Expansion Smoke (Android)"
+    name: "Network Expansion Smoke (Android) - ${{ matrix.split }}"
+    strategy:
+      matrix:
+        split: [1, 2]
+      fail-fast: false
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
-      test-suite-name: smoke-network-expansion-android
+      test-suite-name: smoke-network-expansion-android-${{ matrix.split }}
       platform: android
-      test_suite_tag: ".*NetworkExpansion.*"
+      test_suite_tag: "SmokeNetworkExpansion"
+      split_number: ${{ matrix.split }}
+      total_splits: 2
     secrets: inherit
 
   smoke-performance-android:
-    name: "Performance Smoke (Android)"
+    name: "Performance Smoke (Android) - ${{ matrix.split }}"
+    strategy:
+      matrix:
+        split: [1, 2]
+      fail-fast: false
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
-      test-suite-name: smoke-performance-android
+      test-suite-name: smoke-performance-android-${{ matrix.split }}
       platform: android
-      test_suite_tag: ".*Performance.*"
+      test_suite_tag: "SmokePerformance"
+      split_number: ${{ matrix.split }}
+      total_splits: 2
     secrets: inherit
 
   smoke-card-android:
-    name: "Card Smoke (Android)"
+    name: "Card Smoke (Android) - ${{ matrix.split }}"
+    strategy:
+      matrix:
+        split: [1]
+      fail-fast: false
     uses: ./.github/workflows/run-e2e-workflow.yml
     with:
-      test-suite-name: smoke-card-android
+      test-suite-name: smoke-card-android-${{ matrix.split }}
       platform: android
-      test_suite_tag: ".*SmokeCard.*"
+      test_suite_tag: "SmokeCard"
+      split_number: ${{ matrix.split }}
+      total_splits: 1
     secrets: inherit
 
   report-android-smoke-tests:
@@ -112,7 +166,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: all-test-results/
-          pattern: "*-android-test-results"
+          pattern: "*-android-*-test-results"
 
       - name: Post Test Report
         uses: dorny/test-reporter@dc3a92680fcc15842eef52e8c4606ea7ce6bd3f3
@@ -121,8 +175,8 @@ jobs:
           path: "all-test-results/**/*.xml"
           reporter: "jest-junit"
           fail-on-error: false
-          list-suites: "all"
-          list-tests: "all"
+          list-suites: "failed"
+          list-tests: "failed"
 
       - name: Upload merged report
         uses: actions/upload-artifact@v4

.github/workflows/run-e2e-smoke-tests-ios.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       test-suite-name: smoke-confirmations-ios
       platform: ios
-      test_suite_tag: ".*SmokeConfirmations.*"
+      test_suite_tag: "SmokeConfirmations"
     secrets: inherit
 
   smoke-confirmations-redesigned-ios:
@@ -23,7 +23,7 @@ jobs:
     with:
       test-suite-name: smoke-confirmations-redesigned-ios
       platform: ios
-      test_suite_tag: ".*SmokeConfirmationsRedesigned.*"
+      test_suite_tag: "SmokeConfirmationsRedesigned"
     secrets: inherit
 
   smoke-trade-ios:
@@ -32,7 +32,7 @@ jobs:
     with:
       test-suite-name: smoke-trade-ios
       platform: ios
-      test_suite_tag: ".*SmokeTrade.*"
+      test_suite_tag: "SmokeTrade"
     secrets: inherit
 
   smoke-wallet-platform-ios:
@@ -41,7 +41,7 @@ jobs:
     with:
       test-suite-name: smoke-wallet-platform-ios
       platform: ios
-      test_suite_tag: ".*SmokeWalletPlatform.*"
+      test_suite_tag: "SmokeWalletPlatform"
     secrets: inherit
 
   smoke-identity-ios:
@@ -50,7 +50,7 @@ jobs:
     with:
       test-suite-name: smoke-identity-ios
       platform: ios
-      test_suite_tag: ".*SmokeIdentity.*"
+      test_suite_tag: "SmokeIdentity"
     secrets: inherit
 
   smoke-accounts-ios:
@@ -59,7 +59,7 @@ jobs:
     with:
       test-suite-name: smoke-accounts-ios
       platform: ios
-      test_suite_tag: ".*SmokeAccounts.*"
+      test_suite_tag: "SmokeAccounts"
     secrets: inherit
 
   smoke-network-abstraction-ios:
@@ -68,7 +68,7 @@ jobs:
     with:
       test-suite-name: smoke-network-abstraction-ios
       platform: ios
-      test_suite_tag: ".*SmokeNetworkAbstraction.*"
+      test_suite_tag: "SmokeNetworkAbstractions"
     secrets: inherit
 
   smoke-network-expansion-ios:
@@ -77,7 +77,7 @@ jobs:
     with:
       test-suite-name: smoke-network-expansion-ios
       platform: ios
-      test_suite_tag: ".*NetworkExpansion.*"
+      test_suite_tag: "SmokeNetworkExpansion"
     secrets: inherit
 
   smoke-performance-ios:
@@ -86,7 +86,7 @@ jobs:
     with:
       test-suite-name: smoke-performance-ios
       platform: ios
-      test_suite_tag: ".*Performance.*"
+      test_suite_tag: "SmokePerformance"
     secrets: inherit
 
   smoke-card-ios:
@@ -95,7 +95,7 @@ jobs:
     with:
       test-suite-name: smoke-card-ios
       platform: ios
-      test_suite_tag: ".*SmokeCard.*"
+      test_suite_tag: "SmokeCard"
     secrets: inherit
 
   report-ios-smoke-tests:
@@ -131,8 +131,8 @@ jobs:
           path: "all-test-results/**/*.xml"
           reporter: "jest-junit"
           fail-on-error: false
-          list-suites: "all"
-          list-tests: "all"
+          list-suites: "failed"
+          list-tests: "failed"
 
       - name: Upload merged report
         uses: actions/upload-artifact@v4

.github/workflows/run-e2e-workflow.yml

@@ -18,23 +18,34 @@ on:
         description: 'The Cucumber tag expression to use for filtering tests'
         required: true
         type: string
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.platform }}-${{ inputs.test-suite-name }}
-  cancel-in-progress: ${{ !(contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/heads/stable')) }}
-
+      split_number:
+        description: 'Which split number to run (1-based index)'
+        required: false
+        type: number
+        default: 1
+      total_splits:
+        description: 'Total number of splits to divide tests into'
+        required: false
+        type: number
+        default: 1
 
 jobs:
 
   test-e2e-mobile:
     name: ${{ inputs.test-suite-name }}
-    runs-on: ${{ inputs.platform == 'ios' && 'macos-latest-xlarge' || 'gha-mmsdk-scale-set-ubuntu-22.04-amd64-large' }}
+    runs-on: ${{ inputs.platform == 'ios' && 'macos-latest-xlarge' || 'gha-mmsdk-scale-set-ubuntu-22.04-amd64-xl' }}
+    continue-on-error: true
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.platform }}-${{ inputs.test-suite-name }}-${{ inputs.split_number }}
+      cancel-in-progress: ${{ !(contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/heads/stable')) }}
 
     env:
       METAMASK_ENVIRONMENT: 'qa'
       METAMASK_BUILD_TYPE: 'main'
       TEST_SUITE_TAG: ${{ inputs.test_suite_tag }}
       GITHUB_CI: 'true'
+      SPLIT_NUMBER: ${{ inputs.split_number }}
+      TOTAL_SPLITS: ${{ inputs.total_splits }}
       MM_UNIFIED_SWAPS_ENABLED: 'true'
       RAMP_INTERNAL_BUILD: 'true'
       MM_BRIDGE_ENABLED: 'true'
@@ -165,7 +176,10 @@ jobs:
             export BITRISE_TRIGGERED_WORKFLOW_ID="android_workflow"
           fi
 
-          ./scripts/run-e2e-tags.sh
+          # Always use the splitting script (handles both split and non-split cases)
+          echo "Running split ${{ inputs.split_number }} of ${{ inputs.total_splits }}"
+
+          ./scripts/run-e2e-tags-gha.sh
 
           echo "✅ Test execution completed"