MPT-25022 Cancel in-flight E2E runs on merge and scan before E2E

.github/workflows/cron-main-e2e.yml

@@ -4,6 +4,11 @@ on:
     - cron: '0 8 * * 1,4'
   workflow_dispatch: {}
 
+# Limits E2E test concurrency to 1, canceling any previous run in progress.
+concurrency:
+  group: e2e
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/push-release-branch.yml

@@ -10,10 +10,15 @@ permissions:
   contents: read
 
 jobs:
+
+  # Validation and the SonarCloud scan are deliberately outside the E2E
+  # concurrency group. They are cheap, they are the only place main gets
+  # linted, tested and scanned, and the workflow that would cancel them
+  # (cron-main-e2e.yml) does not repeat them.
   build:
 
     runs-on: ubuntu-latest
-    timeout-minutes: 180
+    timeout-minutes: 30
 
     steps:
     - name: "Checkout"
@@ -27,8 +32,6 @@ jobs:
     - name: "Create environment file"
       run: env | grep -E '^MPT_' > .env
       env:
-        RP_ENDPOINT: ${{ secrets.RP_ENDPOINT }}
-        RP_API_KEY: ${{ secrets.RP_API_KEY }}
         MPT_API_BASE_URL: ${{ secrets.MPT_API_BASE_URL }}
         MPT_API_TOKEN: ${{ secrets.MPT_API_TOKEN }}
         MPT_API_TOKEN_CLIENT: ${{ secrets.MPT_API_TOKEN_CLIENT }}
@@ -38,6 +41,48 @@ jobs:
     - name: "Run validation & test"
       run: make check-all
 
+    - name: "Run SonarCloud Scan"
+      uses: SonarSource/sonarqube-scan-action@v8.2.1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+    - name: "Stop containers"
+      if: always()
+      run: make down
+
+  # E2E carries the concurrency group on its own, so only one suite runs
+  # against the shared TEST environment at a time and a newer run cancels
+  # the one in flight. The group is a fixed literal shared with
+  # cron-main-e2e.yml because the contended resource is the environment,
+  # not the branch. Keeping it on this job rather than on the workflow is
+  # what stops a scheduled E2E run from cancelling the validation above.
+  e2e:
+
+    needs: build
+    runs-on: ubuntu-latest
+    timeout-minutes: 180
+
+    concurrency:
+      group: e2e
+      cancel-in-progress: true
+
+    steps:
+    - name: "Checkout"
+      uses: actions/checkout@v7
+
+    - name: "Build test containers"
+      run: make build
+
+    - name: "Create environment file"
+      run: env | grep -E '^MPT_' > .env
+      env:
+        MPT_API_BASE_URL: ${{ secrets.MPT_API_BASE_URL }}
+        MPT_API_TOKEN: ${{ secrets.MPT_API_TOKEN }}
+        MPT_API_TOKEN_CLIENT: ${{ secrets.MPT_API_TOKEN_CLIENT }}
+        MPT_API_TOKEN_OPERATIONS: ${{ secrets.MPT_API_TOKEN_OPERATIONS }}
+        MPT_API_TOKEN_VENDOR: ${{ secrets.MPT_API_TOKEN_VENDOR }}
+
     - name: "Run E2E test"
       continue-on-error: true
       run: make e2e args="--reportportal --rp-launch=$RP_LAUNCH --rp-api-key=$RP_API_KEY --rp-endpoint=$RP_ENDPOINT -o rp_launch_attributes=\"$RP_LAUNCH_ATTR\""
@@ -47,12 +92,6 @@ jobs:
         RP_API_KEY: ${{ secrets.RP_API_KEY }}
         RP_LAUNCH_ATTR: ref:${{ github.ref }} event_name:${{ github.event_name }}
 
-    - name: "Run SonarCloud Scan"
-      uses: SonarSource/sonarqube-scan-action@v8.2.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-
     - name: "Stop containers"
       if: always()
       run: make down