feat(playwright): add max-parallel and customizable timeouts, add docker logs on Grafana startup failure (#711)

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>

Author: L2D2Grafana

.github/workflows/cd.yml

@@ -185,6 +185,26 @@ on:
         type: string
         required: false
         default: http://localhost:3000/
+      playwright-grafana-timeout:
+        description: |
+          Seconds to wait for the Grafana endpoint check in Playwright jobs.
+          Default is 60.
+        required: false
+        type: number
+        default: 60
+      playwright-grafana-startup-timeout:
+        description: |
+          Seconds to wait for Grafana startup before endpoint checks begin in
+          Playwright jobs. Default is 60.
+        required: false
+        type: number
+        default: 60
+      playwright-max-parallel:
+        description: |
+          Maximum number of Playwright matrix jobs to run in parallel.
+        required: false
+        type: number
+        default: 256
       playwright-secrets:
         description: |
           The secrets to use for Playwright tests.
@@ -464,7 +484,6 @@ on:
         default: true
         type: boolean
 
-
       branch:
         description: |
           Branch or tag to publish from.
@@ -789,6 +808,9 @@ jobs:
       playwright-docker-compose-file: ${{ inputs.playwright-docker-compose-file }}
       playwright-config: ${{ inputs.playwright-config }}
       playwright-grafana-url: ${{ inputs.playwright-grafana-url }}
+      playwright-grafana-timeout: ${{ inputs.playwright-grafana-timeout }}
+      playwright-grafana-startup-timeout: ${{ inputs.playwright-grafana-startup-timeout }}
+      playwright-max-parallel: ${{ inputs.playwright-max-parallel }}
       playwright-secrets: ${{ inputs.playwright-secrets }}
       playwright-gar-registry: ${{ inputs.playwright-gar-registry }}
 

.github/workflows/ci.yml

@@ -158,6 +158,26 @@ on:
         type: string
         required: false
         default: http://localhost:3000/
+      playwright-grafana-timeout:
+        description: |
+          Seconds to wait for the Grafana endpoint check in Playwright jobs.
+          Default is 60.
+        required: false
+        type: number
+        default: 60
+      playwright-grafana-startup-timeout:
+        description: |
+          Seconds to wait for Grafana startup before endpoint checks begin in
+          Playwright jobs. Default is 60.
+        required: false
+        type: number
+        default: 60
+      playwright-max-parallel:
+        description: |
+          Maximum number of Playwright matrix jobs to run in parallel.
+        required: false
+        type: number
+        default: 256
       playwright-secrets:
         description: |
           The secrets to use for Playwright tests.
@@ -743,6 +763,9 @@ jobs:
       playwright-config: ${{ inputs.playwright-config }}
       report-path: ${{ inputs.playwright-report-path }}
       grafana-url: ${{ inputs.playwright-grafana-url }}
+      grafana-timeout: ${{ inputs.playwright-grafana-timeout }}
+      grafana-startup-timeout: ${{ inputs.playwright-grafana-startup-timeout }}
+      max-parallel: ${{ inputs.playwright-max-parallel }}
       secrets: ${{ (fromJson(needs.test-and-build.outputs.workflow-context).isTrusted && inputs.playwright-secrets != '') && inputs.playwright-secrets || '' }}
       node-version: ${{ inputs.node-version }}
       npm-registry-auth: ${{ inputs.npm-registry-auth }}

.github/workflows/playwright.yml

@@ -72,6 +72,28 @@ on:
         type: string
         required: false
         default: http://localhost:3000/
+      grafana-timeout:
+        description: |
+          Seconds to wait for the HTTP endpoint check before timing out.
+          This maps to wait-for-grafana's `timeout` input.
+        type: number
+        required: false
+        default: 60
+      grafana-startup-timeout:
+        description: |
+          Seconds to wait for Grafana startup before beginning endpoint checks.
+          This maps to wait-for-grafana's `startupTimeout` input.
+        type: number
+        required: false
+        default: 60
+      max-parallel:
+        description: |
+          Maximum number of matrix jobs to run in parallel.
+          Defaults to 256 effectively unbounded. Lower values stagger Docker image pulls and Grafana
+          startup across runners, which can avoid wait-for-grafana flakes.
+        required: false
+        type: number
+        default: 256
       node-version:
         description: Node.js version to use
         type: string
@@ -114,6 +136,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       fail-fast: false
+      max-parallel: ${{ inputs.max-parallel }}
       matrix:
         GRAFANA_IMAGE: ${{fromJson(needs.resolve-versions.outputs.matrix)}}
     name: e2e ${{ matrix.GRAFANA_IMAGE.name }}@${{ matrix.GRAFANA_IMAGE.VERSION }}
@@ -249,9 +272,26 @@ jobs:
           DOCKER_COMPOSE_FILE: ${{ inputs.docker-compose-file }}
 
       - name: Wait for Grafana to start
-        uses: grafana/plugin-actions/wait-for-grafana@wait-for-grafana/v1.0.2
+        id: wait-for-grafana
+        uses: grafana/plugin-actions/wait-for-grafana@wait-for-grafana/v1.0.3
         with:
           url: "${{ inputs.grafana-url }}"
+          timeout: "${{ inputs.grafana-timeout }}"
+          startupTimeout: "${{ inputs.grafana-startup-timeout }}"
+
+      - name: Capture Grafana logs on startup failure
+        if: ${{ failure() && steps.wait-for-grafana.outcome == 'failure' }}
+        shell: bash
+        working-directory: ${{ inputs.plugin-directory }}
+        run: |
+          echo "::group::docker compose ps"
+          docker compose ${DOCKER_COMPOSE_FILE:+-f "$DOCKER_COMPOSE_FILE"} ps -a || true
+          echo "::endgroup::"
+          echo "::group::docker compose logs"
+          docker compose ${DOCKER_COMPOSE_FILE:+-f "$DOCKER_COMPOSE_FILE"} logs --no-color --tail 500 || true
+          echo "::endgroup::"
+        env:
+          DOCKER_COMPOSE_FILE: ${{ inputs.docker-compose-file }}
 
       - name: Run Playwright tests
         id: run-tests