ci(cmt): trigger CMT on RC tag cut (v*-rc*) instead of release-branch push

.github/workflows/cmt-provisioner.yml

@@ -1,14 +1,24 @@
 name: CMT Provisioner
 
-# Lightweight signal workflow for Compatibility Matrix Testing (CMT).
-# When this runs, matterwick detects the workflow_run:requested event, provisions one
-# cloud server per version in its CMT set, and dispatches compatibility-matrix-testing.yml.
-# Triggers: RC tag pushes (e.g. v6.2.2-rc.1) and manual workflow_dispatch.
+# Lightweight trigger workflow for Compatibility Matrix Testing (CMT).
+#
+# Matterwick listens for this workflow's workflow_run:requested event, then provisions one
+# Mattermost cloud instance per version in its CMT version set (auto-derived from Mattermost
+# releases, with `CMTServerVersions` in matterwick config as a manual override) and dispatches
+# compatibility-matrix-testing.yml with the CMT_MATRIX input. When that test workflow completes,
+# Matterwick destroys the provisioned instances (cleanup is keyed off the completed
+# workflow_run, matched by commit SHA).
+#
+# Triggers: an RC tag cut (e.g. `v6.2.0-rc.1`), or a manual run from the Actions tab. The tag
+# glob filters out GA tags (`v6.2.0`) and non-RC pre-releases at the GitHub layer; matterwick
+# re-validates with a strict regex (`shouldTriggerCMT` / `isRCTag`) as defense-in-depth.
 
 on:
+  # RC tag cut. Glob matches the `vX.Y.Z-rc.N` convention; matterwick re-validates strictly.
   push:
     tags:
-      - "v[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+"
+      - "v[0-9]*.[0-9]*.[0-9]*-rc.[0-9]*"
+  # Manual runs from the Actions tab (any ref).
   workflow_dispatch: {}
 
 permissions: {}
@@ -17,5 +27,8 @@ jobs:
   trigger-matterwick:
     runs-on: ubuntu-22.04
     steps:
-      - name: Signal matterwick
-        run: echo "CMT provisioning requested — matterwick will handle provisioning and dispatch."
+      - name: Signal Matterwick to provision CMT servers
+        run: |
+          echo "CMT trigger started for ref: ${GITHUB_REF}"
+          echo "Matterwick provisions one server per configured version and then"
+          echo "dispatches compatibility-matrix-testing.yml automatically."

.github/workflows/e2e-functional-template.yml

@@ -24,11 +24,6 @@ on:
         type: string
         description: "The E2E tests underlying OS"
         required: true
-      nightly:
-        type: boolean
-        description: "True if this is nightly build"
-        required: false
-        default: false
       cmt:
         type: boolean
         description: "True if this is Compatibility Matrix Testing"
@@ -122,11 +117,6 @@ on:
         description: "The E2E tests underlying OS"
         required: true
         default: "ubuntu-24.04"
-      nightly:
-        type: boolean
-        description: "True if this is nightly build"
-        required: false
-        default: false
       cmt:
         type: boolean
         description: "True if this is Compatibility Matrix Testing"
@@ -220,11 +210,6 @@ jobs:
               ;;
           esac
 
-          if ${{ inputs.nightly }}; then
-            echo "BUILD_SUFFIX=desktop-nightly-${RUNNER_OS}" >> $GITHUB_OUTPUT
-            echo "TYPE=NIGHTLY" >> $GITHUB_ENV
-          fi
-
       - name: e2e/set-build-id
         run: echo "BUILD_ID=${{ github.run_id }}-${{ steps.variables.outputs.BUILD_SUFFIX }}" >> $GITHUB_ENV
 

.github/workflows/e2e-functional.yml

@@ -23,14 +23,9 @@ on:
         type: string
         description: "The server version to test against"
         required: true
-      nightly:
-        type: boolean
-        description: "True if this is nightly build"
-        required: false
-        default: false
       run_type:
         type: string
-        description: "Run type for test reporting (PR/RELEASE). Auto-detected from branch if not provided."
+        description: "Run type for test reporting (PR / MASTER / RELEASE). Matterwick sends MASTER for master pushes; PR-label runs leave this blank (default PR). Settable on manual dispatch for ad-hoc RELEASE runs."
         required: false
         default: ""
       pr_number:
@@ -95,8 +90,11 @@ jobs:
       MM_SERVER_VERSION: ${{ inputs.MM_SERVER_VERSION }}
       MM_TEST_USER_NAME: ${{ inputs.MM_TEST_USER_NAME }}
       MM_TEST_PASSWORD: ${{ inputs.MM_TEST_PASSWORD }}
-      TYPE: ${{ inputs.run_type != '' && inputs.run_type || startsWith(inputs.version_name, 'release-') && 'RELEASE' || 'PR' }}
-      nightly: ${{ inputs.nightly }}
+      # When matterwick fires this workflow it sets run_type explicitly (MASTER for master
+      # pushes; PR-label runs are dispatched without run_type, defaulting to PR via the `|| 'PR'`
+      # below). The previous `startsWith(version_name, 'release-') && 'RELEASE'` fallback was
+      # for matterwick's release-branch push, which is no longer wired — removed.
+      TYPE: ${{ inputs.run_type || 'PR' }}
     secrets: inherit
 
   update-final-status: