see what breaks 🤷

.github/actions/run-docker/action.yml

@@ -37,11 +37,6 @@ runs:
         DOCKER_SERVICES: ${{ inputs.services }}
         HOST_UID: ${{ steps.id.outputs.id }}
       run: |
-        if [[ -z "${{ inputs.run }}" ]]; then
-          echo "run input is required"
-          exit 1
-        fi
-
         # Start the specified services
         make up
 

.github/workflows/ci.yml

@@ -1,21 +1,39 @@
 name: CI
 
 on:
+  # Runs when there is a push to the default branch
+  # This triggers tests and a pushed "latest" image
+  # That is deployed to the "dev" environment
   push:
     branches:
       - master
+  # Runs on pull requests to verify changes and push
+  # PR image for local testing
   pull_request:
-    branches:
-      - master
+  # Manually dispatch to update cache or to push an image
+  # From any ref
   workflow_dispatch:
+    inputs:
+      splits:
+        description: 'The number of splits for test_main'
+        required: true
+        default: '14'
+  # Runs when a release is published
+  # Pushes a tagged image
+  # That is deployed to the "staging/production" environments
+  release:
+    types: [published]
 
 concurrency:
   # different events on the same ref can run in parallel
   # different refs on the same event can run in parallel
-  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name}}
+  # different splits on the same ref + event can run in parallel
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name}}-${{ inputs.splits}}
   cancel-in-progress: true
 
 env:
+  log_artifact: test_main_logs
+  log_file: report.json
   docs_artifact: docs
 
 jobs:
@@ -32,7 +50,6 @@ jobs:
       is_fork: ${{ steps.context.outputs.is_fork }}
       is_dependabot: ${{ steps.context.outputs.is_dependabot }}
       is_default_branch: ${{ steps.context.outputs.is_default_branch }}
-      is_push: ${{ steps.context.outputs.is_push }}
 
     steps:
       - name: Log context
@@ -55,24 +72,19 @@ jobs:
           # https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions
           is_dependabot="${{ github.actor == 'dependabot[bot]' }}"
 
-          # Are we running on a push event
-          # Many jobs/steps only execute or change execution on push events
-          is_push="${{ github.event_name == 'push' }}"
 
           if [[ "${{ github.event_name }}" == 'pull_request' ]]; then
             # repository on a pull request refers to the base which is always mozilla/addons-server
             is_fork=${{ github.event.pull_request.head.repo.fork }}
           else
-            # Repository on a push refers to the head which would be the fork
+            # In most events, the epository refers to the head which would be the fork
+            # This is different in a pullrequest where we need to check the head explicitly
             is_fork="${{ github.event.repository.fork }}"
           fi
 
-          echo "github.event.repository.full_name ${{ github.event.repository.full_name }}"
-
           echo "is_default_branch=$is_default_branch" >> $GITHUB_OUTPUT
           echo "is_fork=$is_fork" >> $GITHUB_OUTPUT
           echo "is_dependabot=$is_dependabot" >> $GITHUB_OUTPUT
-          echo "is_push=$is_push" >> $GITHUB_OUTPUT
 
           echo "event_name: ${{ github.event_name }}"
           cat $GITHUB_OUTPUT
@@ -93,7 +105,6 @@ jobs:
         shell: bash
         run: |
           is_fork="${{ needs.context.outputs.is_fork == 'true' }}"
-          is_default_branch="${{ needs.context.outputs.is_default_branch == 'true' }}"
           is_dependabot="${{ needs.context.outputs.is_dependabot == 'true' }}"
 
           # Default behaviour is to build images for any CI.yml run
@@ -106,7 +117,7 @@ jobs:
           fi
 
           # Dependabot PRs are treated as if they are from forks (see above)
-          if [[ "$is_dependabot" == 'true' && "$is_default_branch" == 'false' ]]; then
+          if [[ "$is_dependabot" == 'true' && "${{ github.event_name }}" == 'pull_request' ]]; then
             should_build="false"
           fi
 
@@ -217,7 +228,7 @@ jobs:
     # to the default branch
     # that is not running on a fork
     if: |
-      needs.context.outputs.is_push == 'true' &&
+      github.event_name == 'push' &&
       needs.context.outputs.is_default_branch == 'true' &&
       needs.context.outputs.is_fork == 'false'
     permissions:
@@ -256,7 +267,7 @@ jobs:
           run: make extract_locales
 
       - name: Push Locales
-        if: needs.context.outputs.is_push
+        if: github.event_name == 'push'
         shell: bash
         run: |
           if [[ "${{ needs.context.outputs.is_fork == 'true' }}" == 'true' ]]; then
@@ -270,38 +281,6 @@ jobs:
             make push_locales ARGS="${args}"
           fi
 
-  test_test_addons_versions_files_ratings:
-    runs-on: ubuntu-latest
-    needs: build
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Test (test_addons_versions_files_ratings)
-        uses: ./.github/actions/run-docker
-        with:
-          services: ''
-          digest: ${{ needs.build.outputs.digest }}
-          version: ${{ needs.build.outputs.version }}
-          run: |
-            make test_addons_versions_files_ratings
-
-  test_amo_lib_locales_and_signing:
-    runs-on: ubuntu-latest
-    needs: build
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Test (test_amo_lib_locales_and_signing)
-        uses: ./.github/actions/run-docker
-        with:
-          services: ''
-          digest: ${{ needs.build.outputs.digest }}
-          version: ${{ needs.build.outputs.version }}
-          run: |
-            make test_amo_lib_locales_and_signing
-
   test_needs_locales_compilation:
     runs-on: ubuntu-latest
     needs: build
@@ -338,82 +317,118 @@ jobs:
             make update_assets
             make test_static_assets
 
-  test_devhub:
+  test_internal_routes_allowed:
     runs-on: ubuntu-latest
     needs: build
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Test (test_devhub)
+      - name: Test (test_internal_routes_allowed)
         uses: ./.github/actions/run-docker
         with:
           services: ''
           digest: ${{ needs.build.outputs.digest }}
           version: ${{ needs.build.outputs.version }}
           run: |
-            make test_devhub
+            make test_internal_routes_allowed
 
-  test_main:
+  test_es_tests:
     runs-on: ubuntu-latest
     needs: build
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Test (test_main)
+      - name: Test (test_es_tests)
         uses: ./.github/actions/run-docker
         with:
           services: ''
           digest: ${{ needs.build.outputs.digest }}
           version: ${{ needs.build.outputs.version }}
           run: |
-            make test_main
+            make test_es_tests
 
-  test_reviewers_and_zadmin:
+  test_config:
     runs-on: ubuntu-latest
-    needs: build
+
+    outputs:
+      matrix: ${{ steps.result.outputs.matrix }}
+      splits: ${{ steps.result.outputs.splits }}
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Test (test_reviewers_and_zadmin)
-        uses: ./.github/actions/run-docker
-        with:
-          services: ''
-          digest: ${{ needs.build.outputs.digest }}
-          version: ${{ needs.build.outputs.version }}
-          run: |
-            make test_reviewers_and_zadmin
+      - name: Calculate splits
+        id: result
+        shell: bash
+        run: |
+          splits=${{ inputs.splits || 14 }}
+          echo "splits: $splits"
+          echo "splits=$splits" >> $GITHUB_OUTPUT
 
-  test_internal_routes_allowed:
+          # Construct the matrix input for test_main using the groups count
+          # the matrix.group should be an array of numbers from 1 to $splits
+          matrix=[$(seq -s, 1 $splits)]
+          echo "matrix: $matrix"
+          echo "matrix=$matrix" >> $GITHUB_OUTPUT
+
+  test_main:
     runs-on: ubuntu-latest
-    needs: build
+    needs: [build, test_config]
+    strategy:
+      fail-fast: false
+      matrix:
+        group: ${{fromJson(needs.test_config.outputs.matrix)}}
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Test (test_internal_routes_allowed)
+      - name: Test (test_matrix)
         uses: ./.github/actions/run-docker
         with:
           services: ''
           digest: ${{ needs.build.outputs.digest }}
           version: ${{ needs.build.outputs.version }}
+          compose_file: docker-compose.yml
           run: |
-            make test_internal_routes_allowed
+            split="--splits ${{ needs.test_config.outputs.splits }}"
+            group="--group ${{ matrix.group }}"
+            report="--report-log ${{ env.log_file}}"
+            make test_main ARGS="${split} ${group} ${report}"
 
-  test_es_tests:
+      - name: Upload logs
+        uses: actions/upload-artifact@v4
+        with:
+          path: ${{ env.log_file }}
+          name: ${{ env.log_artifact }}-${{ matrix.group }}
+          retention-days: 1
+          overwrite: true
+
+  test_log:
     runs-on: ubuntu-latest
-    needs: build
+    if: always()
+    needs: [build, test_config, test_main]
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Test (test_es_tests)
-        uses: ./.github/actions/run-docker
+      - uses: actions/download-artifact@v4
         with:
-          services: ''
-          digest: ${{ needs.build.outputs.digest }}
-          version: ${{ needs.build.outputs.version }}
-          run: |
-            make test_es_tests
+          pattern: ${{ env.log_artifact }}*
+
+      - name: Cat logs
+        shell: bash
+        run: |
+          for dir in $(ls -d ${{ env.log_artifact }}* | sort -V); do
+            job=$(basename "$dir")
+            file="${dir}/${{ env.log_file }}"
+            if [ -f "$file" ]; then
+              cat "$file" | jq \
+                -r \
+                --arg job "$job" \
+                'select(has("when") and .when == "teardown") | "[\($job)] \(.outcome) \(.nodeid)"'
+            else
+              echo "$file: No such file or directory"
+            fi
+          done