sandynz commented on PR #38277: URL: https://github.com/apache/shardingsphere/pull/38277#issuecomment-3978800770
# Major Change 2 - E2E-SQL CI: two-matrix approach so smoke always runs fixed 6 scenarios. To fix Major Change 1 When `test_framework=true` (or `core_infra`/`pom_changes`), the full-matrix fallback caused `e2e-sql-smoke` to fan out to ~119 jobs instead of a small stable set. The fix splits matrix generation into a fixed smoke stage and a dynamic full stage, ensuring stage 1 is always small regardless of what triggered CI. ## `generate-e2e-sql-matrix.sh` - Now outputs two matrices: `smoke-matrix` (always the 6 fixed scenarios: `empty_rules`, `db`, `tbl`, `encrypt`, `readwrite_splitting`, `passthrough`) and `full-matrix` (existing dynamic logic unchanged) - `matrix` kept as alias for `full-matrix` for backward compatibility - `has-jobs` reflects full-matrix; `need-proxy-image` is `true` if **either** matrix contains a proxy job - Extra passthrough connector-version job (`-Dmysql-connector-java.version=8.3.0`) excluded from smoke-matrix, present in full-matrix only - Smoke matrix applies the same adapter/mode/database dimension-selection rules and the same 5 excludes as the full matrix - Adds `::notice::` logging: counts for both matrices, full-fallback flag, selected dimensions ## `generate-remaining-matrix.sh` - Signature changed from `(filter-json, previous-matrix)` to `(full-matrix, smoke-matrix)` — receives pre-computed JSON directly, no longer re-invokes the generator - `remaining = full.include − smoke.include` keyed on `adapter + mode + database + scenario + additional-options` ## `e2e-sql.yml` - `detect-and-generate-matrix` exposes two new outputs: `smoke-matrix`, `full-matrix` - `e2e-sql-smoke` uses `smoke-matrix` → always ≤30 jobs regardless of fallback trigger - `detect-remaining-matrix` passes `full-matrix` + `smoke-matrix` env vars to the updated script; stage 2 runs the delta only after smoke passes **Example outcome for `test_framework=true`:** smoke=30 jobs (6 scenarios × all dimensions − excludes), full=119 jobs, stage-2 remaining=89 jobs. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
