[CI, Android] (Disaggregated): run full inproc trace acceptance beside monolith controls

2026-11-07 01:53:24 +09:00 · 2026-09-20 10:43:06 -04:00
parent 7fd83133c0
commit bb3a51995c
3 changed files with 140 additions and 16 deletions
@@ -44,6 +44,9 @@ jobs:
          distribution: zulu
          java-version: '17'

+      - name: Android replay lifecycle regression
+        run: python3 tools/trace_replay/test_android_lifecycle.py
+
      - name: Setup Gradle
        uses: gradle/actions/setup-gradle@v6
        with:
@@ -275,6 +278,8 @@ jobs:
    name: trace case matrix
    runs-on: ubuntu-latest
    needs: build
+    env:
+      MOBILEGL_CI_DISAGGREGATED: ${{ (github.ref_name == 'feat/disaggregated' || github.ref_name == 'codex/fix-github-ci') && 'ON' || 'OFF' }}
    outputs:
      android: ${{ steps.trace-cases.outputs.android }}
      names: ${{ steps.trace-cases.outputs.names }}
@@ -285,7 +290,12 @@ jobs:
      - name: Load trace cases
        id: trace-cases
        run: |
-          echo "android=$(python3 tools/trace_replay/trace_cases.py --ci --format github-apk-matrix)" >> "$GITHUB_OUTPUT"
+          python3 tools/trace_replay/trace_cases.py --self-test-transport-matrices
+          matrix_format=github-apk-matrix
+          if [ "${MOBILEGL_CI_DISAGGREGATED}" = "ON" ]; then
+            matrix_format=github-apk-transport-matrix
+          fi
+          echo "android=$(python3 tools/trace_replay/trace_cases.py --ci --format "${matrix_format}")" >> "$GITHUB_OUTPUT"
          echo "names=$(python3 tools/trace_replay/trace_cases.py --ci --format names)" >> "$GITHUB_OUTPUT"

  trace-fixtures:
@@ -398,7 +408,7 @@ jobs:
            --avd-name "${AVD_NAME}"

  retrace:
-    name: retrace (${{ matrix.backend.name }}, ${{ matrix.case.name }})
+    name: retrace (${{ matrix.backend.name }} / ${{ matrix.lane || 'monolith-control' }} / ${{ matrix.transport || 'monolith' }}, ${{ matrix.case.name }})
    runs-on: ubuntu-latest
    needs:
      - build
@@ -408,7 +418,8 @@ jobs:
    if: ${{ always() && needs.build.result == 'success' && needs.android-avd.result == 'success' && needs.trace-cases.result == 'success' }}
    timeout-minutes: 75
    env:
-      MOBILEGL_CI_DISAGGREGATED: ${{ (github.ref_name == 'feat/disaggregated' || github.ref_name == 'codex/fix-github-ci') && 'ON' || 'OFF' }}
+      MOBILEGL_CI_TRANSPORT: ${{ matrix.transport || 'monolith' }}
+      MOBILEGL_CI_LANE: ${{ matrix.lane || 'monolith-control' }}
      AVD_NAME: mobilegl-ci
      ANDROID_AVD_HOME: ${{ github.workspace }}/.android/avd
      ANDROID_HOME: ${{ github.workspace }}/.android/sdk
@@ -508,11 +519,13 @@ jobs:
          apk_file="android-retrace-apks/MobileGL-plugin-trace-release-${GITHUB_SHA}.apk"
          test -f "${apk_file}"
          extra_retrace_args=()
-          if [ "${MOBILEGL_CI_DISAGGREGATED}" = "ON" ]; then
+          if [ "${MOBILEGL_CI_TRANSPORT}" = "inproc" ]; then
            extra_retrace_args+=(
              --env "MOBILEGL_TRANSPORT=inproc;MOBILEGL_IPC_ROLE_SPLIT_STATE=1;MOBILEGL_IPC_STRICT_ERRORS=1;MOBILEGL_IPC_RUN_AHEAD=1"
              --require-inproc
            )
+          else
+            extra_retrace_args+=(--env "MOBILEGL_TRANSPORT=monolith")
          fi
          # Bliss needs the newer signed ANGLE variant plus sampler mipmap
          # min-filter downgrading on ANGLE llvmpipe.
@@ -595,6 +608,12 @@ jobs:
          safe_case="$(printf '%s' '${{ matrix.case.name }}' | sed 's/[^A-Za-z0-9._-]/_/g')"
          result_dir="android-retrace-result/${safe_case}-${{ matrix.backend.name }}"
          mkdir -p "${result_dir}"
+          python3 - "${result_dir}/lane.json" <<'PY'
+          import json, os, sys
+          from pathlib import Path
+          Path(sys.argv[1]).write_text(json.dumps({"lane": os.environ["MOBILEGL_CI_LANE"],
+              "transport": os.environ["MOBILEGL_CI_TRANSPORT"]}, indent=2))
+          PY
          if [ -s "${{ matrix.case.golden }}" ]; then
            cp "${{ matrix.case.golden }}" "${result_dir}/${safe_case}-${{ matrix.backend.name }}-golden.png"
          fi
@@ -631,7 +650,7 @@ jobs:
        if: always()
        uses: actions/upload-artifact@v7
        with:
-          name: MobileGL-android-retrace-result-${{ env.date_today }}-${{ github.sha }}-${{ matrix.backend.name }}-${{ matrix.case.name }}
+          name: MobileGL-android-retrace-result-${{ matrix.lane || 'monolith-control' }}-${{ matrix.transport || 'monolith' }}-${{ env.date_today }}-${{ github.sha }}-${{ matrix.backend.name }}-${{ matrix.case.name }}
          path: android-retrace-result/**
          if-no-files-found: warn

@@ -640,6 +659,8 @@ jobs:
    runs-on: ubuntu-latest
    needs: retrace
    if: always()
+    env:
+      MOBILEGL_CI_DISAGGREGATED: ${{ (github.ref_name == 'feat/disaggregated' || github.ref_name == 'codex/fix-github-ci') && 'ON' || 'OFF' }}

    steps:
      - name: Checkout repo
@@ -654,25 +675,52 @@ jobs:
        with:
          node-version: '22'

-      - name: Download Android retrace results
+      - name: Download Android monolith control results
        uses: actions/download-artifact@v8
        with:
-          pattern: MobileGL-android-retrace-result-*
-          path: retrace-artifacts
+          pattern: MobileGL-android-retrace-result-monolith-control-monolith-*
+          path: retrace-artifacts/monolith-control

-      - name: Render retrace summary
+      - name: Download Android inproc acceptance results
+        if: env.MOBILEGL_CI_DISAGGREGATED == 'ON'
+        uses: actions/download-artifact@v8
+        with:
+          pattern: MobileGL-android-retrace-result-inproc-acceptance-inproc-*
+          path: retrace-artifacts/inproc-acceptance
+
+      - name: Render monolith control summary
        run: |
          node tools/trace_replay/render_retrace_summary.mjs \
-            --input retrace-artifacts \
-            --output-dir android-retrace-summary \
-            --title "MobileGL Android retrace overview" \
-            --group-label "Android Emulator" \
-            --html mobilegl-android-retrace-overview.html
+            --input retrace-artifacts/monolith-control \
+            --output-dir android-retrace-summary/monolith-control \
+            --title "MobileGL Android monolith control" \
+            --group-label "Android Emulator / monolith control" \
+            --html mobilegl-android-monolith-control.html

-      - name: Upload Android retrace summary
+      - name: Render inproc acceptance summary
+        if: env.MOBILEGL_CI_DISAGGREGATED == 'ON'
+        run: |
+          node tools/trace_replay/render_retrace_summary.mjs \
+            --input retrace-artifacts/inproc-acceptance \
+            --output-dir android-retrace-summary/inproc-acceptance \
+            --title "MobileGL Android inproc acceptance" \
+            --group-label "Android Emulator / inproc acceptance" \
+            --html mobilegl-android-inproc-acceptance.html
+
+      - name: Upload Android monolith control summary
        uses: actions/upload-artifact@v7
        with:
-          path: android-retrace-summary/mobilegl-android-retrace-overview.html
+          name: MobileGL-android-monolith-control-summary-${{ github.sha }}
+          path: android-retrace-summary/monolith-control/mobilegl-android-monolith-control.html
+          archive: false
+          if-no-files-found: error
+
+      - name: Upload Android inproc acceptance summary
+        if: env.MOBILEGL_CI_DISAGGREGATED == 'ON'
+        uses: actions/upload-artifact@v7
+        with:
+          name: MobileGL-android-inproc-acceptance-summary-${{ github.sha }}
+          path: android-retrace-summary/inproc-acceptance/mobilegl-android-inproc-acceptance.html
          archive: false
          if-no-files-found: error