From 257ff9fccb7575cf7f42f834ded618d6ba318841 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Wed, 24 Jun 2026 16:15:23 +0200 Subject: [PATCH 1/2] Split integration-short so commits to main run the full cloud suite integration-short did both -short (skip CloudSlow) and DATABRICKS_TEST_SKIPLOCAL=1 (skip everything with testserver coverage). Since #5644 pointed push-to-main at the PR workflow, main inherited both and stopped catching testserver-vs-cloud divergence. Split into three targets: - integration: full suite incl. CloudSlow (nightly cron, unchanged). - integration-short: -short only, for commits to main. - integration-short-skiplocal: -short + skiplocal, for PRs. The two -short targets revert to -timeout=2h; the 12h bump (#5658) is only needed for the full suite. Co-authored-by: Isaac --- Taskfile.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index fe6966653b..a7c4c50ae7 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -694,7 +694,21 @@ tasks: -- -parallel 4 -timeout=12h integration-short: - desc: Run short integration tests + desc: Run integration tests except the slow ones (skips CloudSlow via -short) + deps: [install-pythons] + cmds: + - | + VERBOSE_TEST=1 \ + go run -modfile=tools/go.mod ./tools/testrunner/main.go \ + {{.GO_TOOL}} gotestsum \ + --format github-actions \ + --rerun-fails \ + --jsonfile output.json \ + --packages "./acceptance ./integration/..." \ + -- -parallel 4 -timeout=2h -short + + integration-short-skiplocal: + desc: Run integration tests for PRs (skips CloudSlow and tests with testserver coverage) deps: [install-pythons] cmds: - | @@ -705,7 +719,7 @@ tasks: --rerun-fails \ --jsonfile output.json \ --packages "./acceptance ./integration/..." \ - -- -parallel 4 -timeout=12h -short + -- -parallel 4 -timeout=2h -short dbr-integration: desc: Run DBR acceptance tests on Databricks Runtime From 6895e413f19905044e4e9ba3a6f7806c54bc1327 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Wed, 24 Jun 2026 20:33:37 +0200 Subject: [PATCH 2/2] Restore 12h timeout for integration-short (commits to main) The full -short cloud suite that runs on commits to main hits the 2h timeout (#5705 integration run timed out with 384 MISS). It includes testserver-covered tests, so it's much larger than the PR suite. Keep 2h only for integration-short-skiplocal (PRs). Co-authored-by: Isaac --- Taskfile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Taskfile.yml b/Taskfile.yml index a7c4c50ae7..33f2391b95 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -705,7 +705,7 @@ tasks: --rerun-fails \ --jsonfile output.json \ --packages "./acceptance ./integration/..." \ - -- -parallel 4 -timeout=2h -short + -- -parallel 4 -timeout=12h -short integration-short-skiplocal: desc: Run integration tests for PRs (skips CloudSlow and tests with testserver coverage)