ci: fix the nightly test runs

Author: eamonnmoloney

.github/actions/generate-chart-matrix-nightly/action.yaml

@@ -40,6 +40,7 @@ runs:
             echo "  - version: ${camunda_version}" >> matrix_versions.txt
             echo "    case: nightly" >> matrix_versions.txt
             echo "    scenario: $(echo "$nightlyScenario" | yq e '.name' -)" >> matrix_versions.txt
+            echo "    shortname: $(echo "$nightlyScenario" | yq e '.shortname' -)" >> matrix_versions.txt
             echo "    auth: $(echo "$nightlyScenario" | yq e '.auth' -)" >> matrix_versions.txt
             echo "    exclude: $(echo "$nightlyScenario" | yq e '.exclude | join("|")' -)" >> matrix_versions.txt
             echo "    values-enterprise: $(echo "$nightlyScenario" | yq e '.enterprise // "false"' -)" >> matrix_versions.txt

.github/workflows/test-chart-version-nightly-template.yaml

@@ -29,9 +29,40 @@ on:
         required: false
         default: "false"
         type: string
+      platforms:
+        description: The deployment cloud platform
+        required: true
+        type: string
+      shortname:
+        description: Shortname for the scenario within the identifier
+        required: true
+        type: string
+      run-all-e2e-tests:
+        description: "Run all E2E tests (playwright)"
+        required: false
+        default: false
+        type: boolean
+      platforms:
+        description: The deployment cloud platform
+        default: gke
+        required: false
+        type: string
+      flows:
+        description: The flows to run
+        default: "install,upgrade"
+        type: string
+        required: false
+      e2e-enabled:
+        required: false
+        default: true
+        type: boolean
+      deployment-ttl:
+        required: false
+        default: 1h
+        type: string
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ inputs.scenario }}-${{ inputs.camunda-version }}-${{ inputs.auth }}-${{ inputs.exclude }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ inputs.shortname }}-${{ inputs.camunda-version }}-${{ inputs.auth }}-${{ inputs.exclude }}-${{ inputs.platforms }}
   cancel-in-progress: true
 
 permissions:
@@ -46,23 +77,47 @@ jobs:
       camunda-helm-dir: "camunda-platform-${{ inputs.camunda-version }}"
       camunda-helm-git-ref: "${{ github.event.pull_request.head.sha }}"
 
+  parse-platforms:
+    name: Parse platforms
+    runs-on: ubuntu-latest
+    env:
+      SCENARIOS_LIST: ${{ inputs.scenarios }}
+    outputs:
+      platforms: ${{ steps.make-json-array.outputs.platforms }}
+    steps:
+      - name: Convert string to JSON array and set as output
+        id: make-json-array
+        run: |
+          platforms="${{ inputs.platforms }}"
+          echo "platforms=$(jq -cn --arg p "$platforms" '$p | split(",")')" >> "$GITHUB_OUTPUT"
+          echo "platforms=$platforms"
+
   integration:
-    name: Camunda ${{ inputs.camunda-version }} - ${{ matrix.scenario }}
-    needs: validation
+    name: ${{ matrix.platform }} - ITs
+    needs: [validation, parse-platforms]
     permissions:
       contents: read
       id-token: write
       deployments: write
     secrets: inherit
+    strategy:
+      matrix:
+        platform: ${{ fromJson(needs.parse-platforms.outputs.platforms) }}
     uses: ./.github/workflows/test-integration-template.yaml
     with:
-      identifier: "${{ inputs.camunda-version }}"
-      platforms: "gke"
-      flows: "install,upgrade"
+      identifier: "${{ github.event.pull_request.number || git.ref }}-intg-${{ inputs.camunda-version }}-${{ matrix.platform }}"
+      deployment-ttl: "${{ contains(github.event.pull_request.labels.*.name, 'test-persistent') && '1w' || inputs.deployment-ttl }}"
+      flows: ${{ inputs.flows }}
       camunda-helm-dir: "camunda-platform-${{ inputs.camunda-version }}"
-      test-case: "${{ inputs.case }}"
-      scenario: "${{ inputs.scenario }}"
-      auth: "${{ inputs.auth }}"
-      exclude: "${{ inputs.exclude }}"
-      values-enterprise: "${{ inputs.values-enterprise }}"
       camunda-helm-git-ref: "${{ github.event.pull_request.head.sha }}"
+      caller-git-ref: "${{ github.event.pull_request.head.sha }}"
+      test-case: ${{inputs.case}}
+      scenario: ${{inputs.scenario}}
+      e2e-enabled: ${{ inputs.e2e-enabled }}
+      shortname: ${{inputs.shortname}}
+      auth: ${{inputs.auth}}
+      exclude: ${{inputs.exclude}}
+      platforms: ${{ matrix.platform }}
+      run-all-e2e-tests: ${{ inputs.run-all-e2e-tests }}
+      always-delete-namespace: true
+      values-enterprise: "${{ inputs.values-enterprise }}"

.github/workflows/test-chart-version-nightly.yaml

@@ -5,9 +5,41 @@ on:
   schedule:
     # Set the cron schedule to run nightly at midnight US time, EST (4AM UTC)
     - cron: "0 4 * * *"
+  pull_request:
+    paths:
+      - ".github/workflows/test-chart-version-nightly-template.yaml"
+      - ".github/workflows/test-chart-version-nightly.yaml"
+      - ".github/workflows/test-integration-template.yaml"
+      - ".github/workflows/test-integration-runner.yaml"
+      - ".github/charts/*/test/ci-test-config.yaml"
   push:
     branches:
     - "feature/ee-images-prem"
+  workflow_dispatch: 
+    inputs:
+      platforms:
+        description: The deployment cloud platform
+        default: "gke"
+        required: false
+        type: choice
+        options:
+          - gke
+          - eks
+          - rosa
+          - gke,eks
+      flows:
+        description: The flows to run
+        default: "install"
+        required: false
+        type: choice
+        options:
+          - install
+          - upgrade
+          - install,upgrade
+      deployment-ttl:
+        required: false
+        default: 1h
+        type: string
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.run_id }}
@@ -32,10 +64,10 @@ jobs:
         id: generate-chart-versions
         uses: ./.github/actions/generate-chart-matrix-nightly
 
-  test:
+  integation-tests:
+    name: ${{ matrix.version }} - ${{ inputs.platforms || 'gke' }} - ${{ matrix.case }} - ${{ matrix.shortname }}
     if: ${{ needs.init.outputs.matrix != '[]' }}
-    name: Camunda ${{ matrix.version }}
-    needs: init
+    needs: [init, matrix-version-only, validation]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.init.outputs.matrix) }}
@@ -45,6 +77,10 @@ jobs:
       camunda-version: ${{ matrix.version }}
       case: ${{ matrix.case }}
       scenario: ${{ matrix.scenario }}
+      shortname: ${{ matrix.shortname }}
       auth: ${{ matrix.auth }}
+      platforms: ${{ inputs.platforms || 'gke,eks' }}
       exclude: ${{ matrix.exclude }}
+      flows: ${{ inputs.flows || 'install,upgrade' }}
+      deployment-ttl: ${{ inputs.deployment-ttl || '1h' }}
       values-enterprise: ${{ matrix.values-enterprise }}