Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Adjust the quarantine consumer for top level `suites` (#79547)

Nemanja Glumac11091c1db20c
diff --git a/.github/actions/test-driver/action.yml b/.github/actions/test-driver/action.yml
index 417e5decf7c..341077a739a 100644
--- a/.github/actions/test-driver/action.yml
+++ b/.github/actions/test-driver/action.yml
@@ -22,11 +22,6 @@ inputs:
description: Edition to test (oss or ee)
quarantine-engine:
required: false
- driver-status:
- required: false
- default: ""
- description: >-
- Configured status for this driver ("info", "skip", "required", or empty), as reported by `mage driver-decisions`.
granular-rerun:
required: false
default: "true"
@@ -114,8 +109,8 @@ runs:
fi
shell: bash
id: run-test
- # Keep this step continue-on-error because the quarantine logic controls whether it ultimately fails.
- # Driver "info" status can affect this logic. See below.
+ # Keep this step continue-on-error because the quarantine gate below controls whether it
+ # ultimately fails.
continue-on-error: true
- name: Report failed tests to ci-conductor
@@ -178,13 +173,7 @@ runs:
# Last, because this is the only step allowed to fail the job: everything above it reports the
# failure (JUnit report, logs, ci-conductor) and must run regardless of the verdict below.
- name: Quarantine gate
- # Off master and release branches an "info" driver is data-collection only - the test always passes!
- # On master and release branches "info" carries no weight - the quarantine logic applies.
- if: |
- !cancelled()
- && steps.run-test.outcome == 'failure'
- && !(inputs.driver-status == 'info'
- && !(github.ref_name == 'master' || startsWith(github.ref_name, 'release-x')))
+ if: ${{ !cancelled() && steps.run-test.outcome == 'failure' }}
uses: ./.github/actions/quarantine-gate
with:
adapter: backend
diff --git a/.github/actions/upload-test-results/action.yml b/.github/actions/upload-test-results/action.yml
index fd3a2985b25..7ff3b27bddf 100644
--- a/.github/actions/upload-test-results/action.yml
+++ b/.github/actions/upload-test-results/action.yml
@@ -14,25 +14,6 @@ inputs:
default: us-east-1
bucket:
required: true
- previous-step-outcome:
- required: false
- default: ""
- description: >-
- Outcome of the test step. Only read when `driver-status` is "info", to report the
- real result of a job that was forced green.
- driver-status:
- required: false
- default: ""
- description: >-
- Configured status for this driver ("info", "skip", "required", or empty). When
- "info", the job is reported as passing regardless of the real test outcome, and
- that outcome is surfaced via a job summary and (on PRs) a comment instead.
- report-variant:
- required: false
- default: ""
- description: >-
- Optional label disambiguating matrix legs of the same job, so the info-driver
- job summary and PR comment stay distinct per leg.
runs:
using: "composite"
@@ -57,105 +38,3 @@ runs:
run: | # sh
DATE=$(date '+%Y-%m-%d')
aws s3 cp ${OUTPUT_FILE}.zip s3://$BUCKET/$DATE/$GITHUB_RUN_ID/$GITHUB_RUN_ATTEMPT/
-
- # For "info" drivers the job is forced green above, so surface the real outcome here —
- # but only when it did NOT pass, to avoid spamming summaries/comments for healthy runs.
- # Never include logs or stack traces — only the real status and a link to the run.
- - name: Report info-level driver result (job summary)
- if: ${{ always() && inputs.driver-status == 'info' && inputs.previous-step-outcome == 'failure' }}
- shell: bash
- env:
- OUTCOME: ${{ inputs.previous-step-outcome }}
- LABEL: ${{ inputs.output-name }}
- VARIANT: ${{ inputs.report-variant }}
- run: | # sh
- if [ "$OUTCOME" = "success" ]; then EMOJI="✅"; else EMOJI="❌"; fi
- TITLE="$LABEL"
- [ -n "$VARIANT" ] && TITLE="$LABEL ($VARIANT)"
- RUN_URL="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"
- {
- echo "### ℹ️ Info-level driver: $TITLE"
- echo ""
- echo "Reported as passing (non-blocking). Real result: $EMOJI \`$OUTCOME\`"
- echo ""
- echo "[View run]($RUN_URL)"
- } >> "$GITHUB_STEP_SUMMARY"
-
- # Maintain ONE PR comment per commit for all info drivers. Each leg upserts its own line
- # (keyed by a hidden tag); a passing leg removes its line, and the comment is deleted once
- # no failing legs remain. Comments from older commits are cleaned up. Runs on pass and fail
- # so recoveries self-heal. Never includes logs or stack traces — only status and a run link.
- - name: Sync info-level driver result into the PR comment
- if: ${{ always() && inputs.driver-status == 'info' && github.event_name == 'pull_request' }}
- uses: actions/github-script@v9
- continue-on-error: true
- env:
- OUTCOME: ${{ inputs.previous-step-outcome }}
- LABEL: ${{ inputs.output-name }}
- VARIANT: ${{ inputs.report-variant }}
- with:
- script: | # js
- const { OUTCOME, LABEL, VARIANT, GITHUB_SERVER_URL, GITHUB_REPOSITORY, GITHUB_RUN_ID } = process.env;
- const pr = context.payload.pull_request;
- if (!pr) return;
- const { owner, repo } = context.repo;
- const sha = pr.head.sha;
- // PREFIX matches the current per-commit marker AND the older per-leg one, so legacy
- // comments from a previous version get cleaned up on the next sync.
- const PREFIX = "<!-- info-driver-result";
- const marker = `<!-- info-driver-results:${sha} -->`;
- const header = `${marker}\nℹ️ **Info-level drivers** failed (non-blocking) on \`${sha.slice(0, 7)}\` — these do not gate:`;
- const lineKey = `${LABEL}:${VARIANT}`;
- const title = VARIANT ? `${LABEL} (${VARIANT})` : LABEL;
- const runUrl = `${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}`;
- // Only real failures are reported; cancelled/skipped/success remove this leg's line.
- // List-item line with the hidden key tag at the END so markdown (links) renders.
- const ourLine = OUTCOME === "failure"
- ? `- **${title}** — ❌ \`${OUTCOME}\` ([Logs](${runUrl})) <!--l:${lineKey}-->`
- : null;
- const linesOf = (body) => body.split("\n").filter((l) => l.includes("<!--l:"));
-
- const sync = async () => {
- const { data: comments } = await github.rest.issues.listComments({
- owner, repo, issue_number: pr.number, per_page: 100,
- });
- const tagged = comments.filter((c) => c.body.includes(PREFIX));
- // Drop comments left over from older commits.
- for (const c of tagged.filter((c) => !c.body.includes(marker))) {
- await github.rest.issues.deleteComment({ owner, repo, comment_id: c.id }).catch(() => {});
- }
- const mine = tagged
- .filter((c) => c.body.includes(marker))
- .sort((a, b) => new Date(a.created_at) - new Date(b.created_at));
- // Merge any duplicates raced into existence; latest write of each line wins.
- const byKey = new Map();
- for (const c of mine) {
- for (const l of linesOf(c.body)) {
- const m = l.match(/<!--l:(.*?)-->/);
- if (m) byKey.set(m[1], l);
- }
- }
- if (ourLine) byKey.set(lineKey, ourLine);
- else byKey.delete(lineKey);
- const lines = [...byKey.values()].sort();
- const target = mine[0];
- for (const c of mine.slice(1)) {
- await github.rest.issues.deleteComment({ owner, repo, comment_id: c.id }).catch(() => {});
- }
- if (lines.length === 0) {
- if (target) await github.rest.issues.deleteComment({ owner, repo, comment_id: target.id }).catch(() => {});
- return;
- }
- const body = [header, "", ...lines].join("\n");
- if (target) {
- await github.rest.issues.updateComment({ owner, repo, comment_id: target.id, body });
- } else {
- await github.rest.issues.createComment({ owner, repo, issue_number: pr.number, body });
- }
- };
-
- // Retry to shrink the window where parallel legs clobber each other's update.
- for (let i = 0; i < 4; i++) {
- try { await sync(); break; }
- catch (e) { if (i === 3) throw e; await new Promise((r) => setTimeout(r, 400 * (i + 1))); }
- }
diff --git a/.github/workflows/app-db.yml b/.github/workflows/app-db.yml
index 7f7a06c64aa..ccef60bc160 100644
--- a/.github/workflows/app-db.yml
+++ b/.github/workflows/app-db.yml
@@ -134,7 +134,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
be-tests-mysql:
if: ${{ !inputs.skip }}
@@ -270,7 +269,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
be-tests-postgres:
if: ${{ !inputs.skip }}
@@ -381,7 +379,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
app-db-tests-result:
needs:
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index 04763f14106..bce18465b80 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -290,7 +290,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.run-java-tests.outcome }}
- name: Publish Test Report (JUnit)
uses: dorny/test-reporter@a43b3a5f7366b97d083190328d2c652e1a8b6aa2 # v3.0.0
diff --git a/.github/workflows/disabled-drivers-slack-notification.yml b/.github/workflows/disabled-drivers-slack-notification.yml
index 018e31ce2a4..9a5e130e80c 100644
--- a/.github/workflows/disabled-drivers-slack-notification.yml
+++ b/.github/workflows/disabled-drivers-slack-notification.yml
@@ -34,18 +34,18 @@ jobs:
const lastUpdated = config.metadata?.last_updated || 'unknown';
const reason = config.metadata?.reason || 'No reason provided';
+ // "skip" is the only status CI reads: the driver is not run at all. A driver that
+ // runs but must not gate is expressed as a suite-level rule in CI Conductor, which
+ // reports it in its own UI.
const skipped = drivers.filter(d => d.status === 'skip').map(d => d.name);
- const info = drivers.filter(d => d.status === 'info').map(d => d.name);
- if (skipped.length === 0 && info.length === 0) {
- console.log('No drivers are disabled or collecting data. Skipping Slack notification.');
+ if (skipped.length === 0) {
+ console.log('No drivers are disabled. Skipping Slack notification.');
return;
}
const list = (names) => names.map(d => `\`${d}\``).join(' ');
- const lines = [];
- if (skipped.length) lines.push(`:no_entry: *Disabled (not run):* ${list(skipped)}`);
- if (info.length) lines.push(`:information_source: *Collecting data (non-blocking):* ${list(info)}`);
+ const lines = [`:no_entry: *Disabled (not run):* ${list(skipped)}`];
if (!process.env.SLACK_BOT_TOKEN) {
throw new Error('SLACK_BOT_TOKEN is required');
diff --git a/.github/workflows/drivers.yml b/.github/workflows/drivers.yml
index a9c36eec255..d562b99f634 100644
--- a/.github/workflows/drivers.yml
+++ b/.github/workflows/drivers.yml
@@ -45,26 +45,6 @@ jobs:
sqlite-should-run: ${{ steps.driver-decisions.outputs.sqlite-should-run }}
sqlserver-should-run: ${{ steps.driver-decisions.outputs.sqlserver-should-run }}
vertica-should-run: ${{ steps.driver-decisions.outputs.vertica-should-run }}
- # Per-driver configured status from ci-test-config (skip | info | required)
- h2-status: ${{ steps.driver-decisions.outputs.h2-status }}
- athena-status: ${{ steps.driver-decisions.outputs.athena-status }}
- bigquery-status: ${{ steps.driver-decisions.outputs.bigquery-status }}
- clickhouse-status: ${{ steps.driver-decisions.outputs.clickhouse-status }}
- databricks-status: ${{ steps.driver-decisions.outputs.databricks-status }}
- druid-jdbc-status: ${{ steps.driver-decisions.outputs.druid-jdbc-status }}
- mongo-status: ${{ steps.driver-decisions.outputs.mongo-status }}
- mongo-ssl-status: ${{ steps.driver-decisions.outputs.mongo-ssl-status }}
- mongo-sharded-cluster-status: ${{ steps.driver-decisions.outputs.mongo-sharded-cluster-status }}
- mysql-mariadb-status: ${{ steps.driver-decisions.outputs.mysql-mariadb-status }}
- oracle-status: ${{ steps.driver-decisions.outputs.oracle-status }}
- postgres-status: ${{ steps.driver-decisions.outputs.postgres-status }}
- presto-jdbc-status: ${{ steps.driver-decisions.outputs.presto-jdbc-status }}
- redshift-status: ${{ steps.driver-decisions.outputs.redshift-status }}
- snowflake-status: ${{ steps.driver-decisions.outputs.snowflake-status }}
- sparksql-status: ${{ steps.driver-decisions.outputs.sparksql-status }}
- sqlite-status: ${{ steps.driver-decisions.outputs.sqlite-status }}
- sqlserver-status: ${{ steps.driver-decisions.outputs.sqlserver-status }}
- vertica-status: ${{ steps.driver-decisions.outputs.vertica-status }}
# Per-driver quarantine conflict flags (set when driver is quarantined but has file changes)
athena-quarantine-conflict: ${{ steps.driver-decisions.outputs.athena-quarantine-conflict }}
bigquery-quarantine-conflict: ${{ steps.driver-decisions.outputs.bigquery-quarantine-conflict }}
@@ -86,28 +66,6 @@ jobs:
sqlserver-quarantine-conflict: ${{ steps.driver-decisions.outputs.sqlserver-quarantine-conflict }}
vertica-quarantine-conflict: ${{ steps.driver-decisions.outputs.vertica-quarantine-conflict }}
steps:
- # Up front (before any driver job), drop info-driver comments from older commits so a
- # superseded comment disappears immediately rather than waiting for this run's drivers.
- # Keeps this commit's comment (if any) so a re-run doesn't flicker.
- - name: Remove stale info-driver comments
- if: ${{ github.event_name == 'pull_request' }}
- uses: actions/github-script@v9
- continue-on-error: true
- with:
- script: | # js
- const pr = context.payload.pull_request;
- if (!pr) return;
- const { owner, repo } = context.repo;
- const PREFIX = "<!-- info-driver-result";
- const keep = `<!-- info-driver-results:${pr.head.sha} -->`;
- const { data: comments } = await github.rest.issues.listComments({
- owner, repo, issue_number: pr.number, per_page: 100,
- });
- for (const c of comments) {
- if (c.body.includes(PREFIX) && !c.body.includes(keep)) {
- await github.rest.issues.deleteComment({ owner, repo, comment_id: c.id }).catch(() => {});
- }
- }
- name: Checkout repository
uses: actions/checkout@v6
- name: Fetch base branch
@@ -180,7 +138,6 @@ jobs:
:only-tags [:mb/driver-tests]
:exclude-tags [:mb/transforms-python-test]
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.athena-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -190,8 +147,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.athena-status }}
be-tests-bigquery-cloud-sdk-ee:
needs: determine-driver-skips
@@ -256,7 +211,6 @@ jobs:
test-args: ${{ matrix.job.test-args }}
artifact-suffix: ${{ matrix.job.name }}
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.bigquery-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -266,9 +220,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.bigquery-status }}
- report-variant: ${{ matrix.job.name }}
- name: Cleanup python-runner
if: ${{ always() && matrix.job.needs-python-runner == true }}
uses: ./.github/actions/cleanup-python-runner
@@ -342,7 +293,6 @@ jobs:
test-args: ${{ matrix.job.test-args }}
artifact-suffix: ${{ matrix.job.name }}
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.clickhouse-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -352,8 +302,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.clickhouse-status }}
- name: Cleanup python-runner
if: ${{ always() && matrix.job.needs-python-runner == true }}
uses: ./.github/actions/cleanup-python-runner
@@ -398,7 +346,6 @@ jobs:
:only-tags [:mb/driver-tests]
:exclude-tags [:mb/transforms-python-test]
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.druid-jdbc-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -408,8 +355,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.druid-jdbc-status }}
be-tests-databricks-ee:
needs: determine-driver-skips
@@ -472,7 +417,6 @@ jobs:
artifact-suffix: ${{ matrix.job.name }}
test-args: ${{ matrix.job.test-args }}
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.databricks-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -482,9 +426,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.databricks-status }}
- report-variant: ${{ matrix.job.name }}
be-tests-databricks-multi-catalog-ee:
needs: determine-driver-skips
@@ -548,7 +489,6 @@ jobs:
artifact-suffix: ${{ matrix.job.name }}
test-args: ${{ matrix.job.test-args }}
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.databricks-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -558,9 +498,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.databricks-status }}
- report-variant: ${{ matrix.job.name }}
be-tests-h2:
needs: determine-driver-skips
@@ -581,7 +518,6 @@ jobs:
:only-tags [:mb/driver-tests]
:exclude-tags [:mb/transforms-python-test]
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.h2-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -591,8 +527,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.h2-status }}
be-tests-h2-oss:
needs: determine-driver-skips
@@ -614,7 +548,6 @@ jobs:
:only-tags [:mb/driver-tests]
:exclude-tags [:mb/transforms-python-test]
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.h2-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -624,8 +557,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.h2-status }}
be-tests-mysql-mariadb:
needs: determine-driver-skips
@@ -757,7 +688,6 @@ jobs:
${{ matrix.job.test-args }}
:exclude-tags '[ ${{ matrix.job.exclude-tag }} ${{ env.__ADDITIONAL_EXCLUDED_TAG__ }}]'
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.mysql-mariadb-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -767,8 +697,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.mysql-mariadb-status }}
- name: Cleanup python-runner
if: always()
uses: ./.github/actions/cleanup-python-runner
@@ -839,7 +767,6 @@ jobs:
test-args: ${{ matrix.job.test-args }}
artifact-suffix: ${{ matrix.version.name }}-${{ matrix.job.name }}
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.mongo-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -849,8 +776,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.mongo-status }}
- name: Cleanup python-runner
if: ${{ always() && matrix.job.needs-python-runner == true }}
uses: ./.github/actions/cleanup-python-runner
@@ -923,7 +848,6 @@ jobs:
:exclude-tags '[:mongo-sharded-cluster-tests :mb/transforms-python-test]'
:only-tags [:mb/driver-tests]
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.mongo-ssl-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -933,8 +857,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.mongo-ssl-status }}
be-tests-mongo-sharded-cluster-ee:
needs: determine-driver-skips
@@ -970,7 +892,6 @@ jobs:
test-args: >-
:only metabase.driver.mongo.sharded-cluster-test
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.mongo-sharded-cluster-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -980,8 +901,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.mongo-sharded-cluster-status }}
be-tests-oracle:
needs: determine-driver-skips
@@ -1057,7 +976,6 @@ jobs:
:only-tags [:mb/driver-tests]
:exclude-tags [:mb/transforms-python-test]
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.oracle-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -1067,8 +985,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.oracle-status }}
be-tests-postgres:
needs: determine-driver-skips
@@ -1163,7 +1079,6 @@ jobs:
${{ matrix.job.test-args }}
:exclude-tags '[ ${{ matrix.job.exclude-tag }} ${{ env.__ADDITIONAL_EXCLUDED_TAG__ }}]'
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.postgres-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -1173,9 +1088,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.postgres-status }}
- report-variant: ${{ matrix.version.name }}-${{ matrix.job.name }}
- name: Cleanup python-runner
if: always()
uses: ./.github/actions/cleanup-python-runner
@@ -1253,7 +1165,6 @@ jobs:
:only-tags [:mb/driver-tests]
:exclude-tags [:mb/transforms-python-test]
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.presto-jdbc-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -1263,8 +1174,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.presto-jdbc-status }}
be-tests-redshift-ee:
needs: determine-driver-skips
@@ -1339,7 +1248,6 @@ jobs:
${{ matrix.job.test-args }}
artifact-suffix: ${{ matrix.job.name }}
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.redshift-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: ${{ !matrix.job.skip && !cancelled() }}
@@ -1349,9 +1257,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.redshift-status }}
- report-variant: ${{ matrix.job.name }}
- name: Cleanup python-runner
if: ${{ always() && matrix.job.needs-python-runner == true }}
uses: ./.github/actions/cleanup-python-runner
@@ -1425,7 +1330,6 @@ jobs:
test-args: ${{ matrix.job.test-args }}
artifact-suffix: ${{ matrix.job.name }}
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.snowflake-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -1435,9 +1339,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.snowflake-status }}
- report-variant: ${{ matrix.job.name }}
- name: Cleanup python-runner
if: ${{ always() && matrix.job.needs-python-runner == true }}
uses: ./.github/actions/cleanup-python-runner
@@ -1480,7 +1381,6 @@ jobs:
:only-tags [:mb/driver-tests]
:exclude-tags [:mb/transforms-python-test]
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.sparksql-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -1490,8 +1390,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.sparksql-status }}
be-tests-sqlite-ee:
needs: determine-driver-skips
@@ -1523,7 +1421,6 @@ jobs:
:only-tags [:mb/driver-tests]
:exclude-tags [:mb/transforms-python-test]
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.sqlite-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -1533,8 +1430,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.sqlite-status }}
be-tests-sqlserver:
needs: determine-driver-skips
@@ -1601,7 +1496,6 @@ jobs:
test-args: ${{ matrix.job.test-args }}
artifact-suffix: ${{ matrix.version.name }}-${{ matrix.job.name }}
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.sqlserver-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -1611,8 +1505,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.sqlserver-status }}
- name: Cleanup python-runner
if: ${{ always() && matrix.job.needs-python-runner == true }}
uses: ./.github/actions/cleanup-python-runner
@@ -1729,7 +1621,6 @@ jobs:
:only-tags [:mb/driver-tests]
:exclude-tags [:mb/transforms-python-test]
quarantine-engine: ${{ vars.QUARANTINE_ENGINE }}
- driver-status: ${{ needs.determine-driver-skips.outputs.vertica-status }}
- name: Upload Test Results
uses: ./.github/actions/upload-test-results
if: always()
@@ -1739,22 +1630,13 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
- driver-status: ${{ needs.determine-driver-skips.outputs.vertica-status }}
drivers-tests-result:
needs:
- # Supplies each driver's configured status (info/skip/required) so this gate can ignore
- # "info" drivers regardless of their result -- including cancelled or timed-out runs, which
- # the per-job continue-on-error cannot force green because the controlling step never
- # completes. Not a driver job; it is filtered out of the pass/fail check below.
- determine-driver-skips
# if you add a driver job, you must add it to this list for it to be a required check
- be-tests-h2
- be-tests-athena-ee
- # Listed unconditionally; ci-test-config controls their effect via per-driver status.
- # An "info" driver is reported as passing, so it never blocks this check; flip it to
- # "required" in the config to make a real failure gate, with no change here.
- be-tests-snowflake-ee
- be-tests-bigquery-cloud-sdk-ee
- be-tests-databricks-ee
@@ -1783,46 +1665,18 @@ jobs:
uses: actions/github-script@v9
env:
needs: ${{ toJson(needs) }}
- # Job name -> configured driver status, from determine-driver-skips. An "info" driver is
- # data-collection only and must never gate; a cancelled/timed-out info job lands here as
- # cancelled/failure (its own continue-on-error can't force it green), so we drop info jobs
- # from the gate entirely. Empty/unknown status falls back to "required" (gates as before).
- statuses: |
- {
- "be-tests-athena-ee": "${{ needs.determine-driver-skips.outputs.athena-status }}",
- "be-tests-bigquery-cloud-sdk-ee": "${{ needs.determine-driver-skips.outputs.bigquery-status }}",
- "be-tests-clickhouse-ee": "${{ needs.determine-driver-skips.outputs.clickhouse-status }}",
- "be-tests-databricks-ee": "${{ needs.determine-driver-skips.outputs.databricks-status }}",
- "be-tests-druid-jdbc-ee": "${{ needs.determine-driver-skips.outputs.druid-jdbc-status }}",
- "be-tests-h2": "${{ needs.determine-driver-skips.outputs.h2-status }}",
- "be-tests-mongo": "${{ needs.determine-driver-skips.outputs.mongo-status }}",
- "be-tests-mongo-ssl": "${{ needs.determine-driver-skips.outputs.mongo-ssl-status }}",
- "be-tests-mongo-sharded-cluster-ee": "${{ needs.determine-driver-skips.outputs.mongo-sharded-cluster-status }}",
- "be-tests-mysql-mariadb": "${{ needs.determine-driver-skips.outputs.mysql-mariadb-status }}",
- "be-tests-oracle": "${{ needs.determine-driver-skips.outputs.oracle-status }}",
- "be-tests-postgres": "${{ needs.determine-driver-skips.outputs.postgres-status }}",
- "be-tests-presto-jdbc-ee": "${{ needs.determine-driver-skips.outputs.presto-jdbc-status }}",
- "be-tests-redshift-ee": "${{ needs.determine-driver-skips.outputs.redshift-status }}",
- "be-tests-snowflake-ee": "${{ needs.determine-driver-skips.outputs.snowflake-status }}",
- "be-tests-sparksql-ee": "${{ needs.determine-driver-skips.outputs.sparksql-status }}",
- "be-tests-sqlite-ee": "${{ needs.determine-driver-skips.outputs.sqlite-status }}",
- "be-tests-sqlserver": "${{ needs.determine-driver-skips.outputs.sqlserver-status }}"
- }
with:
script: | # js
const needs = JSON.parse(process.env.needs);
- const statuses = JSON.parse(process.env.statuses);
- // Drop the determine-driver-skips bookkeeping job, then drop "info" drivers: they are
- // non-gating, so their result (including cancelled/timed-out) must not fail this check.
+ // Drop the determine-driver-skips bookkeeping job; every remaining job is a driver
+ // job whose result gates this check.
const jobs = Object.entries(needs)
.filter(([jobName]) => jobName !== 'determine-driver-skips')
.map(([jobName, jobValues]) => ({
name: jobName,
- result: jobValues.result,
- status: statuses[jobName] || 'required'
- }))
- .filter(job => job.status !== 'info');
+ result: jobValues.result
+ }));
// are all jobs skipped or successful?
if (jobs.every(job => (job.result === 'skipped' || job.result === 'success'))) {
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 8e537569814..709da3f7056 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -226,7 +226,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ inputs.specs && steps.tagged-e2e.outcome || steps.split-e2e.outcome }}
- name: Quarantine gate
# Only one of the two run steps executes; the other reports `skipped`. Only gate on actual failure.
diff --git a/.github/workflows/embedding-sdk-component-tests.yml b/.github/workflows/embedding-sdk-component-tests.yml
index f934138c241..73359f15586 100644
--- a/.github/workflows/embedding-sdk-component-tests.yml
+++ b/.github/workflows/embedding-sdk-component-tests.yml
@@ -120,7 +120,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.run-tests.outcome }}
- name: Quarantine gate
if: ${{ !cancelled() && steps.run-tests.outcome == 'failure' }}
@@ -300,7 +299,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.run-tests.outcome }}
- name: Quarantine gate
if: ${{ !cancelled() && steps.run-tests.outcome == 'failure' }}
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 4657bf7a313..ca381ff34dd 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -138,7 +138,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.fe-tests.outcome }}
fe-tests-timezones:
if: ${{ !inputs.skip }}
diff --git a/.github/workflows/minimal-tests.yml b/.github/workflows/minimal-tests.yml
index e4dfce5df95..4ae500a7bc7 100644
--- a/.github/workflows/minimal-tests.yml
+++ b/.github/workflows/minimal-tests.yml
@@ -79,7 +79,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
# Postgres driver tests
postgres-driver-test:
@@ -126,7 +125,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
# Frontend unit tests
frontend-unit-tests:
@@ -179,7 +177,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.run-tests.outcome }}
# Summary job
minimal-tests-result:
diff --git a/.github/workflows/semantic-search.yml b/.github/workflows/semantic-search.yml
index 9b903c77879..df0597a61c3 100644
--- a/.github/workflows/semantic-search.yml
+++ b/.github/workflows/semantic-search.yml
@@ -72,7 +72,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
semantic-search-tests-mariadb:
if: ${{ !inputs.skip }}
@@ -148,7 +147,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
semantic-search-tests-mysql:
if: ${{ !inputs.skip }}
@@ -231,7 +229,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
semantic-search-tests-postgres:
if: ${{ !inputs.skip }}
@@ -306,7 +303,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
# pgvector-on-the-app-db mode: the app db itself is a pgvector-capable Postgres and
# MB_PGVECTOR_DB_URL is deliberately unset. The dedicated-harness tests gate themselves off; the
@@ -371,7 +367,6 @@ jobs:
bucket: ${{ vars.AWS_S3_TEST_RESULTS_BUCKET }}
role-to-assume: ${{ secrets.CI_TEST_RESULTS_IAM_ROLE }}
aws-region: ${{ vars.AWS_REGION }}
- previous-step-outcome: ${{ steps.test-driver.outputs.test-outcome }}
semantic-search-tests-result:
needs:
diff --git a/bb.edn b/bb.edn
index 06cb9a4f74a..31d29518617 100644
--- a/bb.edn
+++ b/bb.edn
@@ -425,8 +425,8 @@
"RUN"
(str "any of " (pr-str driver-triggers) " affected by module changes")]
["12" "Self-hosted driver, not affected" "SKIP" "driver module not affected"]]))
- "\nThis table decides only WHETHER a driver runs. A driver's configured status then\n"
- "applies to that decision (see 'Driver Status' below) and never overrides it.\n"
+ "\nThis table decides only WHETHER a driver runs. Whether its failures GATE is a separate\n"
+ "question, answered at the end of the job by ci-conductor's quarantine rules.\n"
"\nNote: the remote quarantine list (status = skip) is ignored entirely on master and\n"
"release-* branches -- every driver runs and gates there (Priority 4 is bypassed).\n"
"\n\n## Labels of Interest\n\n"
@@ -436,14 +436,9 @@
" ci:all-cloud-drivers Run all cloud drivers (athena, bigquery, databricks, redshift, snowflake)\n"
" break-quarantine-DRIVER Un-quarantine a specific driver, e.g. break-quarantine-mysql\n"
"\n## Driver Status (from the CI driver config)\n\n"
- "Each driver also gets a configured status, emitted as DRIVER-status=... for the result job. The\n"
- "run/skip decision above always takes precedence; status only shapes the outcome of a run mage\n"
- "decides on:\n\n"
- " skip Listed with status \"skip\": not run at all (quarantined; break-quarantine-DRIVER overrides)\n"
- " info Listed with status \"info\": if mage decides to run it, the run proceeds but its result\n"
- " must NOT gate (data collection). info NEVER forces a run -- if mage wouldn't run the\n"
- " driver, info does not change that.\n"
- " required No configured status: runs and gates as usual (the default)\n"
+ " skip Listed with status \"skip\" in ci-test-config.json: not run at all (quarantined;\n"
+ " break-quarantine-DRIVER overrides). Every other driver runs and gates as usual.\n"
+ "\nTo let a driver run but not gate, add a suite-quarantine rule in CI Conductor instead.\n"
"\n## All Drivers\n\n"
(str/join ", " (map name (sort mage.modules/all-drivers)))
"\n")))
diff --git a/mage/src/mage/modules.clj b/mage/src/mage/modules.clj
index b64909a8628..6f80efc5a5a 100644
--- a/mage/src/mage/modules.clj
+++ b/mage/src/mage/modules.clj
@@ -355,53 +355,44 @@
(or (seq (get driver-directory->drivers driver-name))
[(keyword driver-name)]))
-(defn- driver-statuses
- "Map of driver keyword -> status keyword (`:skip` or `:info`) sourced from the top-level
- `drivers` array in ci-test-config.json. Each entry identifies a driver by its short `name`
- (e.g. \"snowflake\"). Drivers absent from the config are implicitly `:required` and do not
- appear in this map.
+(defn- skip-drivers
+ "Set of driver keywords listed with status `\"skip\"` in the top-level `drivers` array of
+ ci-test-config.json. Each entry identifies a driver by its short `name` (e.g. \"snowflake\");
+ a few names fan out to several jobs. `skip` means: do not run the driver at all (subject to
+ the break-quarantine-<driver> label). Drivers absent from the config run and gate as usual.
- :skip -- do not run the driver at all (subject to the break-quarantine-<driver> label)
- :info -- run the driver, but its result must not gate (data collection only)
+ Whether a driver's failures GATE is a separate question, answered by ci-conductor's
+ suite-level quarantine rules at the end of the job -- not by this config.
This MUST NOT break CI: any failure to read or parse the config (network error,
- malformed JSON, etc.) is swallowed and yields an empty map, so every driver falls back
- to `:required` (runs and gates) -- the safe default."
+ malformed JSON, etc.) is swallowed and yields an empty set, so every driver runs and
+ gates -- the safe default."
[]
(try
- (into {}
- (comp (keep (fn [{driver-name :name, status :status}]
- (when-let [status-kw (#{:skip :info} (keyword status))]
- [driver-name status-kw])))
- (mapcat (fn [[driver-name status-kw]]
- (map (fn [driver] [driver status-kw])
- (config-name->drivers driver-name)))))
+ (into #{}
+ (comp (filter (fn [{status :status}] (= "skip" status)))
+ (mapcat (fn [{driver-name :name}] (config-name->drivers driver-name))))
(get (read-ci-test-config) :drivers []))
(catch Throwable e
;; stderr, not stdout: in --github-output-only mode stdout is redirected into $GITHUB_OUTPUT.
(binding [*out* *err*]
- (println (c/yellow (str "WARNING: could not read driver statuses from ci-test-config ("
+ (println (c/yellow (str "WARNING: could not read skipped drivers from ci-test-config ("
(.getMessage e) "); treating all drivers as required."))))
- {})))
-
-(defn- skip-drivers
- "Set of driver keywords with status `:skip` in `statuses` (these are quarantined: not run)."
- [statuses]
- (into #{} (keep (fn [[driver status]] (when (= status :skip) driver))) statuses))
+ #{})))
(defn- effective-quarantined-drivers
- "Set of `:skip` (quarantined) drivers to actually enforce for this run.
+ "Set of quarantined drivers to actually enforce for this run.
The quarantine list is fetched on the fly from a remote file (ci-test-config.json, see
- [[driver-statuses]]) and can change at any time. We intentionally IGNORE it on `master` and
+ [[skip-drivers]]) and can change at any time. We intentionally IGNORE it on `master` and
`release-*` branches: there, every driver must run and gate, so a stray remote quarantine entry
can't silently disable a driver's tests (nor raise a quarantine-conflict, which would fail a push
demanding a PR-only break-quarantine label). On PR/feature branches the quarantine is honored,
subject to the break-quarantine-<driver> label."
- [statuses is-master-or-release]
+ [skipped is-master-or-release]
(if is-master-or-release
#{}
- (skip-drivers statuses)))
+ skipped))
(defn- parse-bool
"Parse a string boolean from CLI args. Returns true for 'true', false otherwise."
@@ -543,12 +534,10 @@
:skip (parse-bool (:skip options))
:particular-driver-changed? particular-driver-changed?
:verbose? (not github-output-only?)}
- statuses (driver-statuses)
- ;; `:skip` drivers are quarantined (not run); `:info`/`:required` drivers run normally.
;; On master/release we drop the remote quarantine list entirely (see
;; [[effective-quarantined-drivers]]) so every driver runs and gates, and no
;; quarantine-conflict is raised.
- quarantined (effective-quarantined-drivers statuses is-master-or-release)
+ quarantined (effective-quarantined-drivers (skip-drivers) is-master-or-release)
updated-files (u/updated-files git-ref)
updated (updated-files->updated-modules updated-files)
driver-affected? (driver-deps-affected? updated)
@@ -557,8 +546,7 @@
effective-driver-affected? (or driver-affected? important-file-changed?)
decisions (mapv (fn [driver]
(assoc (driver-decision driver ctx effective-driver-affected? quarantined updated)
- :driver driver
- :status (get statuses driver :required)))
+ :driver driver))
all-drivers)
;; Check for quarantined drivers with file changes but no break-quarantine label
quarantined-with-changes (into #{}
@@ -571,9 +559,8 @@
(if github-output-only?
;; In github-output-only mode, print just the key=value lines (no colors)
(do
- (doseq [{:keys [driver should-run status]} decisions]
- (println (str (name driver) "-should-run=" should-run))
- (println (str (name driver) "-status=" (name status))))
+ (doseq [{:keys [driver should-run]} decisions]
+ (println (str (name driver) "-should-run=" should-run)))
(doseq [driver quarantined-with-changes]
(println (str (name driver) "-quarantine-conflict=true"))))
(do
@@ -587,14 +574,10 @@
(println "")
;; Print human-readable decision summary
(println "=== Driver Decisions ===")
- (doseq [{:keys [driver should-run status reason]} decisions]
- (println (format "%-25s %s %s - %s"
+ (doseq [{:keys [driver should-run reason]} decisions]
+ (println (format "%-25s %s - %s"
(name driver)
(if should-run (c/green "RUN ") (c/yellow "SKIP"))
- (case status
- :info (c/blue "[info] ")
- :skip (c/yellow "[skip] ")
- "[required]")
reason)))
(println "")
;; Print GITHUB_OUTPUT preview with colors
diff --git a/mage/test/mage/modules_test.clj b/mage/test/mage/modules_test.clj
index ecdc927402c..9e07593c6c2 100644
--- a/mage/test/mage/modules_test.clj
+++ b/mage/test/mage/modules_test.clj
@@ -44,17 +44,17 @@
(deftest effective-quarantine-ignored-on-master-and-release
(testing "the remote quarantine list is dropped on master/release, but honored on PR branches"
- (let [statuses {:databricks :skip :snowflake :info}]
- (is (= #{} (#'mage.modules/effective-quarantined-drivers statuses true))
+ (let [skipped #{:databricks}]
+ (is (= #{} (#'mage.modules/effective-quarantined-drivers skipped true))
"master/release: nothing is quarantined")
- (is (= #{:databricks} (#'mage.modules/effective-quarantined-drivers statuses false))
- "PR/feature branch: :skip drivers remain quarantined"))))
+ (is (= #{:databricks} (#'mage.modules/effective-quarantined-drivers skipped false))
+ "PR/feature branch: skipped drivers remain quarantined"))))
(deftest quarantined-driver-runs-on-master
(testing "a driver quarantined in the remote config still runs (and gates) on master/release"
;; Production clears the quarantine set on master/release via effective-quarantined-drivers,
;; so the decision falls through Priority 4 to Priority 5.
- (let [quarantined (#'mage.modules/effective-quarantined-drivers {:mysql :skip} true)
+ (let [quarantined (#'mage.modules/effective-quarantined-drivers #{:mysql} true)
result (mage.modules/driver-decision :mysql
(make-ctx {:is-master-or-release true})
true ; driver-deps-affected?
@@ -386,7 +386,7 @@
mage.modules/driver-deps-affected?)))))
;;; =============================================================================
-;;; ci-test-config `drivers` parsing (skip / info / required status)
+;;; ci-test-config `drivers` parsing (skip status)
;;; =============================================================================
(deftest config-name->drivers-resolves-driver-names
@@ -399,42 +399,32 @@
(#'mage.modules/config-name->drivers "mongo")))))
(def ^:private example-config
- "The new ci-test-config `drivers` shape from DEV-2149."
+ "The ci-test-config `drivers` shape."
{:drivers [{:name "databricks" :status "skip"}
- {:name "snowflake" :status "info"}
- {:name "bigquery" :status "info"}]})
+ {:name "mongo" :status "skip"}
+ {:name "snowflake" :status "required"}]})
-(deftest driver-statuses-maps-names-to-status
- (testing "drivers array is translated to a driver-keyword -> status map"
+(deftest skip-drivers-selects-only-skip-status
+ (testing "only drivers listed with status \"skip\" are quarantined"
(with-redefs [mage.modules/read-ci-test-config (constantly example-config)]
- (is (= {:databricks :skip
- :snowflake :info
- :bigquery :info}
- (#'mage.modules/driver-statuses)))))
- (testing "drivers absent from the config are not present (implicitly :required)"
+ (is (= #{:databricks :mongo :mongo-ssl :mongo-sharded-cluster}
+ (#'mage.modules/skip-drivers)))))
+ (testing "drivers absent from the config are not quarantined"
(with-redefs [mage.modules/read-ci-test-config (constantly example-config)]
- (is (nil? (get (#'mage.modules/driver-statuses) :mysql))))))
+ (is (not (contains? (#'mage.modules/skip-drivers) :mysql))))))
-(deftest driver-statuses-never-throws
- (testing "a failure to read/parse the config yields {} (all drivers required) instead of breaking CI"
+(deftest skip-drivers-never-throws
+ (testing "a failure to read/parse the config yields #{} (all drivers run) instead of breaking CI"
(with-redefs [mage.modules/read-ci-test-config (fn [] (throw (ex-info "boom" {})))]
- (is (= {} (#'mage.modules/driver-statuses))))))
+ (is (= #{} (#'mage.modules/skip-drivers))))))
-(deftest skip-drivers-selects-only-skip-status
- (testing "only :skip drivers are quarantined; :info drivers still run"
- (is (= #{:databricks}
- (#'mage.modules/skip-drivers {:databricks :skip
- :snowflake :info
- :bigquery :info})))))
-
-(deftest info-driver-runs-but-is-not-skipped
- (testing "an :info driver is NOT in the skip-set, so it follows normal run rules (runs on master)"
- ;; skip-set derived from example-config contains only :databricks
- (let [skip-set (#'mage.modules/skip-drivers {:databricks :skip :snowflake :info})
- result (mage.modules/driver-decision :snowflake
- (make-ctx {:is-master-or-release true})
- false
- skip-set
- #{})]
- (is (true? (:should-run result)))
- (is (= "master/release branch" (:reason result))))))
+(deftest non-skip-driver-follows-normal-run-rules
+ (testing "a driver that isn't skipped follows the normal decision rules (runs on master)"
+ (with-redefs [mage.modules/read-ci-test-config (constantly example-config)]
+ (let [result (mage.modules/driver-decision :snowflake
+ (make-ctx {:is-master-or-release true})
+ false
+ (#'mage.modules/skip-drivers)
+ #{})]
+ (is (true? (:should-run result)))
+ (is (= "master/release branch" (:reason result)))))))
diff --git a/release/ci-conductor/src/quarantine.test.ts b/release/ci-conductor/src/quarantine.test.ts
index 2f662c7da62..e24b5e045e9 100644
--- a/release/ci-conductor/src/quarantine.test.ts
+++ b/release/ci-conductor/src/quarantine.test.ts
@@ -7,9 +7,11 @@ import {
type QuarantineEntry,
checkQuarantineGate,
compareFailedToQuarantine,
- fetchQuarantineList,
+ fetchQuarantine,
junitFailuresToFailedTests,
matchKey,
+ quarantinedSuiteGlob,
+ suiteMatchesGlob,
} from "./quarantine.ts";
const failed = (
@@ -165,7 +167,55 @@ describe("junitFailuresToFailedTests", () => {
});
});
-describe("fetchQuarantineList", () => {
+describe("suiteMatchesGlob", () => {
+ it("matches a bare name anywhere in the suite, without wildcards", () => {
+ expect(suiteMatchesGlob("be-tests-athena-ee", "athena")).toBe(true);
+ });
+
+ it("matches case-insensitively", () => {
+ expect(suiteMatchesGlob("be-tests-athena-ee", "ATHENA")).toBe(true);
+ });
+
+ it("expands `*` and `?`", () => {
+ expect(suiteMatchesGlob("be-tests-java-21-mbql", "be-tests-*-mbql")).toBe(true);
+ expect(suiteMatchesGlob("e2e-3", "e2e-?")).toBe(true);
+ expect(suiteMatchesGlob("e2e-12", "e2e-?")).toBe(true); // unanchored
+ });
+
+ it("expands `{a,b}` alternations", () => {
+ expect(suiteMatchesGlob("fe-tests-unit", "{be,fe}-tests")).toBe(true);
+ expect(suiteMatchesGlob("e2e", "{be,fe}-tests")).toBe(false);
+ });
+
+ it("treats regex metacharacters in the rule as literals", () => {
+ expect(suiteMatchesGlob("be-tests-mbql", "be.tests")).toBe(false);
+ expect(suiteMatchesGlob("be.tests-mbql", "be.tests")).toBe(true);
+ });
+
+ it("never matches on an empty or whitespace-only rule", () => {
+ expect(suiteMatchesGlob("e2e", "")).toBe(false);
+ expect(suiteMatchesGlob("e2e", " ")).toBe(false);
+ });
+
+ it("compiles an unbalanced brace instead of throwing", () => {
+ expect(suiteMatchesGlob("be-tests", "{be,fe")).toBe(true);
+ });
+});
+
+describe("quarantinedSuiteGlob", () => {
+ it("returns the rule that covers the suite", () => {
+ expect(quarantinedSuiteGlob("be-tests-athena-ee", ["e2e", "athena"])).toBe(
+ "athena",
+ );
+ });
+
+ it("returns undefined when no rule covers the suite", () => {
+ expect(quarantinedSuiteGlob("be-tests-athena-ee", ["e2e"])).toBeUndefined();
+ expect(quarantinedSuiteGlob("be-tests-athena-ee", [])).toBeUndefined();
+ });
+});
+
+describe("fetchQuarantine", () => {
const originalFetch = globalThis.fetch;
const originalLog = console.log;
const originalError = console.error;
@@ -212,7 +262,7 @@ describe("fetchQuarantineList", () => {
const macrotask = () => new Promise<void>((resolve) => setImmediate(resolve));
/**
- * Settle a `fetchQuarantineList` call on the frozen clock: let its pending
+ * Settle a `fetchQuarantine` call on the frozen clock: let its pending
* awaits run, fire whichever backoff timer that parked it, and repeat until
* it resolves. Bounded, so a call that never settles fails loudly instead of
* hanging the suite.
@@ -230,19 +280,24 @@ describe("fetchQuarantineList", () => {
}
}
if (!done) {
- throw new Error("fetchQuarantineList never settled");
+ throw new Error("fetchQuarantine never settled");
}
return pending;
}
- const okList = (entries: QuarantineEntry[]) =>
- new Response(JSON.stringify({ tests: entries }), { status: 200 });
+ const okList = (entries: QuarantineEntry[], suites?: string[]) =>
+ new Response(JSON.stringify({ tests: entries, suites }), { status: 200 });
const errorStatus = (status: number) => new Response("", { status });
const econnreset = () => new Error("The socket connection was closed unexpectedly");
+ const list = (entries: QuarantineEntry[], suites: string[] = []) => ({
+ tests: entries,
+ suites,
+ });
+
const fetchList = () =>
settle(
- fetchQuarantineList({
+ fetchQuarantine({
baseUrl: "https://ci-conductor.example",
suite: "e2e",
}),
@@ -251,10 +306,24 @@ describe("fetchQuarantineList", () => {
it("returns the list without retrying when the first call succeeds", async () => {
const calls = stubFetch([okList([quarantined("a")])]);
- expect(await fetchList()).toEqual([quarantined("a")]);
+ expect(await fetchList()).toEqual(list([quarantined("a")]));
expect(calls()).toBe(1);
});
+ it("returns the suite-level rules alongside the tests", async () => {
+ stubFetch([okList([quarantined("a")], ["athena", "{be,fe}-*"])]);
+
+ expect(await fetchList()).toEqual(
+ list([quarantined("a")], ["athena", "{be,fe}-*"]),
+ );
+ });
+
+ it("defaults both keys to empty when the response omits them", async () => {
+ stubFetch([new Response(JSON.stringify({ count: 0 }), { status: 200 })]);
+
+ expect(await fetchList()).toEqual(list([]));
+ });
+
it("retries a dropped connection and returns the list from a later attempt", async () => {
const calls = stubFetch([
econnreset(),
@@ -262,7 +331,7 @@ describe("fetchQuarantineList", () => {
okList([quarantined("a")]),
]);
- expect(await fetchList()).toEqual([quarantined("a")]);
+ expect(await fetchList()).toEqual(list([quarantined("a")]));
expect(calls()).toBe(3);
});
@@ -276,14 +345,14 @@ describe("fetchQuarantineList", () => {
it("retries a 5xx", async () => {
const calls = stubFetch([errorStatus(502), okList([])]);
- expect(await fetchList()).toEqual([]);
+ expect(await fetchList()).toEqual(list([]));
expect(calls()).toBe(2);
});
it("retries a 429", async () => {
const calls = stubFetch([errorStatus(429), okList([])]);
- expect(await fetchList()).toEqual([]);
+ expect(await fetchList()).toEqual(list([]));
expect(calls()).toBe(2);
});
@@ -296,7 +365,7 @@ describe("fetchQuarantineList", () => {
it("waits out the backoff window before retrying, rather than hammering", async () => {
const calls = stubFetch([errorStatus(503), okList([])]);
- const pending = fetchQuarantineList({
+ const pending = fetchQuarantine({
baseUrl: "https://ci-conductor.example",
suite: "e2e",
});
@@ -315,7 +384,7 @@ describe("fetchQuarantineList", () => {
await macrotask();
expect(calls()).toBe(2);
- expect(await settle(pending)).toEqual([]);
+ expect(await settle(pending)).toEqual(list([]));
});
});
@@ -419,4 +488,61 @@ describe("checkQuarantineGate", () => {
expect(result.shouldFail).toBe(true);
expect(result.enforced).toBe(true);
});
+
+ /** Serve one `/api/quarantine` body for the duration of `run`. */
+ async function withList<T>(
+ body: { tests?: QuarantineEntry[]; suites?: string[] },
+ run: () => Promise<T>,
+ ): Promise<T> {
+ const originalFetch = globalThis.fetch;
+ globalThis.fetch = (async () =>
+ new Response(JSON.stringify(body), { status: 200 })) as unknown as typeof fetch;
+ try {
+ return await run();
+ } finally {
+ globalThis.fetch = originalFetch;
+ }
+ }
+
+ const gate = (suite: string) =>
+ runCapturingLogs({
+ suite,
+ failures: [failure],
+ baseUrl: "https://ci-conductor.example",
+ secret: "shh",
+ dryRun: false,
+ });
+
+ it("passes an unquarantined failure when a suite rule covers the suite", async () => {
+ const { result, verdict } = await withList(
+ { tests: [], suites: ["athena"] },
+ () => gate("be-tests-athena-ee"),
+ );
+
+ expect(result).toEqual({
+ shouldFail: false,
+ enforced: false,
+ reason: 'suite "be-tests-athena-ee" is quarantined by the rule "athena"',
+ });
+ expect(verdict).toContain("PASS");
+ });
+
+ it("still gates test by test when no suite rule matches", async () => {
+ const { result } = await withList(
+ { tests: [], suites: ["athena"] },
+ () => gate("fe-tests-unit"),
+ );
+
+ expect(result).toEqual({
+ shouldFail: true,
+ enforced: true,
+ reason: "1 of 1 failure(s) are NOT quarantined",
+ });
+ });
+
+ it("gates as before against a server that serves no suite rules", async () => {
+ const { result } = await withList({ tests: [] }, () => gate("e2e"));
+
+ expect(result.shouldFail).toBe(true);
+ });
});
diff --git a/release/ci-conductor/src/quarantine.ts b/release/ci-conductor/src/quarantine.ts
index 60fc24736a2..38b2509601e 100644
--- a/release/ci-conductor/src/quarantine.ts
+++ b/release/ci-conductor/src/quarantine.ts
@@ -1,5 +1,6 @@
// Shared quarantine gate for all three suites: given a run's failed tests, pass
-// iff every failure is on ci-conductor's quarantine list.
+// iff a suite-level rule covers the whole suite, or every failure is on
+// ci-conductor's per-test quarantine list.
import type { NormalizedTest } from "./contract.ts";
import { fetchWithRetry } from "./fetchWithRetry.ts";
@@ -22,6 +23,16 @@ export type QuarantineEntry = {
file_path: string;
};
+/**
+ * What `/api/quarantine` tells a CI job: the individual tests that don't gate,
+ * plus the suite-level glob rules. `suites` is served whole regardless of the
+ * `?suite=` filter — the job matches its own suite name against the rules.
+ */
+export type QuarantineList = {
+ tests: QuarantineEntry[];
+ suites: string[];
+};
+
/**
* A test that ultimately failed in this run. The three identity fields mirror
* ci-conductor's wire/storage names (`NormalizedTest`'s `name`/`path`/`file`
@@ -91,6 +102,68 @@ export function compareFailedToQuarantine(
return { quarantined, unquarantined };
}
+/** Regex-escape a literal glob character. */
+function escapeLiteral(char: string): string {
+ return /[.+^$()|[\]\\]/.test(char) ? `\\${char}` : char;
+}
+
+/**
+ * Compile a suite-quarantine glob to a RegExp: `*` is any run, `?` is one
+ * character, `{a,b}` is an alternation, everything else is literal, and the
+ * whole thing matches UNANCHORED (as a substring) and case-insensitively — so
+ * `athena` catches `be-tests-athena-ee` without a trailing `*`.
+ *
+ * This is a deliberate subset of the minimatch semantics ci-conductor validates
+ * globs against (server repo `shared/suiteGlob.ts`), covering everything that
+ * makes sense for suite names, which have no path separators. `release/ci-conductor`
+ * carries no runtime dependencies and CI runs it straight from the checkout, so
+ * pulling in minimatch itself isn't on the table. Brace depth is tracked, so an
+ * unbalanced `{` closes itself rather than compiling to an invalid pattern.
+ *
+ * The pattern is left unanchored because `RegExp.test` already searches anywhere
+ * in the string — that IS the substring semantics.
+ */
+function globToRegExp(glob: string): RegExp {
+ let source = "";
+ let depth = 0;
+ for (const char of glob) {
+ if (char === "*") {
+ source += ".*";
+ } else if (char === "?") {
+ source += ".";
+ } else if (char === "{") {
+ source += "(";
+ depth += 1;
+ } else if (char === "}" && depth > 0) {
+ source += ")";
+ depth -= 1;
+ } else if (char === "," && depth > 0) {
+ source += "|";
+ } else {
+ source += escapeLiteral(char);
+ }
+ }
+ return new RegExp(source + ")".repeat(depth), "i");
+}
+
+/** Does one suite-quarantine glob cover this suite name? */
+export function suiteMatchesGlob(suite: string, glob: string): boolean {
+ const trimmed = glob.trim();
+ // An empty rule would compile to the empty pattern and match every suite.
+ return trimmed !== "" && globToRegExp(trimmed).test(suite);
+}
+
+/**
+ * The first glob rule that quarantines `suite`, or undefined when none does.
+ * Returning the rule itself lets the gate name it in the verdict.
+ */
+export function quarantinedSuiteGlob(
+ suite: string,
+ globs: string[],
+): string | undefined {
+ return globs.find((glob) => suiteMatchesGlob(suite, glob));
+}
+
/**
* Adapt the JUnit suites' normalized failures to the gate's `FailedTest` shape.
* `parseJunit` only emits failing/erroring testcases, but we filter on `status`
@@ -112,17 +185,18 @@ export function junitFailuresToFailedTests(
* Fetch the quarantine list for `suite` from ci-conductor. The reporter POSTs to
* `.../webhooks/failed-tests`; the list lives at `.../api/quarantine` on the same
* host. Transport errors, timeouts, 429s and 5xx are retried with backoff; a 4xx
- * is the request's own fault and returns straight away. Returns null (not [])
- * when it can't be retrieved, so the caller can tell "nothing quarantined" from
- * "couldn't check". Never throws. Logs the path and suite only — never the host
- * (public repo) or the secret. The retry policy is fixed rather than injectable:
- * the tests drive it on fake timers, so there's nothing to shorten for them.
+ * is the request's own fault and returns straight away. Returns null (not an
+ * empty list) when it can't be retrieved, so the caller can tell "nothing
+ * quarantined" from "couldn't check". Never throws. Logs the path and suite only
+ * — never the host (public repo) or the secret. The retry policy is fixed rather
+ * than injectable: the tests drive it on fake timers, so there's nothing to
+ * shorten for them.
*/
-export async function fetchQuarantineList(opts: {
+export async function fetchQuarantine(opts: {
baseUrl: string;
suite: string;
secret?: string;
-}): Promise<QuarantineEntry[] | null> {
+}): Promise<QuarantineList | null> {
const { baseUrl, suite, secret } = opts;
const base = baseUrl.replace(/\/+$/, "");
const url = `${base}/api/quarantine?suite=${encodeURIComponent(suite)}`;
@@ -153,8 +227,10 @@ export async function fetchQuarantineList(opts: {
return null;
}
// `json()` is `any`; this names the wire shape we read (and only read).
- const body = (await response.json()) as { tests?: QuarantineEntry[] };
- return body.tests ?? [];
+ // Both keys are optional so a server that predates suite-level rules — or
+ // one that starts serving them — needs no lockstep deploy with this script.
+ const body = (await response.json()) as Partial<QuarantineList>;
+ return { tests: body.tests ?? [], suites: body.suites ?? [] };
} catch (error) {
console.error("[ci-conductor] failed to fetch the quarantine list", error);
return null;
@@ -237,7 +313,7 @@ export async function checkQuarantineGate(opts: {
});
}
- const list = await fetchQuarantineList({ baseUrl, suite, secret });
+ const list = await fetchQuarantine({ baseUrl, suite, secret });
if (list === null) {
// Couldn't read the list ⇒ can't confirm everything is quarantined.
return finish({
@@ -248,9 +324,24 @@ export async function checkQuarantineGate(opts: {
});
}
- const { quarantined, unquarantined } = compareFailedToQuarantine(failures, list);
+ // A suite-level rule quarantines the whole suite, so its failures never gate
+ // and there's nothing to compare test by test.
+ const suiteGlob = quarantinedSuiteGlob(suite, list.suites);
+ if (suiteGlob) {
+ log(`🏷️ suite rule "${suiteGlob}" covers this suite — no failure here gates.`);
+ return finish({
+ shouldFail: false,
+ reason: `suite "${suite}" is quarantined by the rule "${suiteGlob}"`,
+ dryRun,
+ });
+ }
+
+ const { quarantined, unquarantined } = compareFailedToQuarantine(
+ failures,
+ list.tests,
+ );
- log(`📋 quarantine list: ${list.length} test(s) registered for "${suite}"`);
+ log(`📋 quarantine list: ${list.tests.length} test(s) registered for "${suite}"`);
log(`💥 this run: ${failures.length} failure(s) to evaluate`);
for (const test of quarantined) {
log(` 🔒 quarantined ${title(test)}`);