fix(e2e): webhook-driven, auto-versioned CMT + fix non-PR dispatch 422

config/config-matterwick.default.json

@@ -78,10 +78,11 @@
   "E2EUsername": "admin",
   "E2EPassword": "",
   "E2EServerVersion": "latest",
-  "E2EAutoTriggerOnRelease": true,
   "E2EAutoTriggerOnMaster": true,
   "E2EReleasePatternPrefix": "release-",
-  "E2ENightlyTriggerWorkflowName": "E2E Nightly Trigger",
   "E2ETestWorkflowNames": ["Electron Playwright Tests", "E2E", "Compatibility Matrix Testing"],
-  "E2EInstanceMaxAge": 6
+  "E2EInstanceMaxAge": 6,
+  "E2EPRInstanceMaxAge": 24,
+  "CMTTriggerWorkflowName": "CMT Provisioner",
+  "CMTServerVersions": ["10.11.18", "11.7.1"]
 }

server/config.go

@@ -112,19 +112,42 @@ type MatterwickConfig struct {
 	E2EUsername                   string
 	E2EPassword                   string
 	E2EServerVersion              string
-	E2EAutoTriggerOnRelease       bool
-	E2EAutoTriggerOnMaster        bool
-	E2EReleasePatternPrefix       string
-	E2ENightlyTriggerWorkflowName string   // workflow name (name: field) of the nightly trigger workflow
-	E2ETestWorkflowNames          []string // workflow names of the actual test workflows (for completion-based cleanup)
+	E2EAutoTriggerOnMaster  bool
+	E2EReleasePatternPrefix string
+	E2ETestWorkflowNames    []string // workflow names of the actual test workflows (for completion-based cleanup)
 	// E2EInstanceMaxAge is the minimum age (in hours) a non-PR E2E instance must reach
 	// before the periodic orphan-cleanup scan will delete it. This prevents the scan
 	// from destroying instances that are still being used by a currently-running test.
 	// Set to the longest expected E2E run duration plus a small buffer.
 	// Default (0): 3 hours.
 	E2EInstanceMaxAge int
+
+	// E2EPRInstanceMaxAge is the maximum age (in hours) a PR E2E instance may reach before
+	// the periodic cleanup scan deletes it. PR instances are intentionally kept alive between
+	// label toggles and across commits so the same servers can be reused for re-runs, so this
+	// is much longer than E2EInstanceMaxAge. When such an instance is reaped its in-memory
+	// tracking entry is also evicted, so re-applying E2E/Run provisions a fresh set.
+	// Default (0): 24 hours.
+	E2EPRInstanceMaxAge int
+
+	// CMTTriggerWorkflowName is the workflow name (the "name:" field) of the lightweight,
+	// scheduled CMT trigger workflow in the desktop/mobile repos. When matterwick receives
+	// a workflow_run "requested" event for this workflow it provisions one instance per
+	// version in CMTServerVersions and dispatches compatibility-matrix-testing.yml.
+	CMTTriggerWorkflowName string
+
+	// CMTServerVersions is an OPTIONAL manual override for the CMT version set. When non-empty
+	// it is used verbatim (values must be valid Mattermost image tags: full semver, no "v"
+	// prefix, e.g. "10.11.0"). When empty (the normal case) matterwick auto-derives the set
+	// from Mattermost's GitHub releases via Server.resolveCMTServerVersions.
+	CMTServerVersions []string
 }
 
+// defaultCMTServerVersions is the fallback CMT version set used only when auto-resolution
+// fails (GitHub API error) and no manual override is configured. Kept reasonably current:
+// the active v10.11 ESR plus a recent v11 release.
+var defaultCMTServerVersions = []string{"10.11.18", "11.7.1"}
+
 func findConfigFile(fileName string) string {
 	if _, err := os.Stat("/tmp/" + fileName); err == nil {
 		fileName, _ = filepath.Abs("/tmp/" + fileName)