Skip to content

Commit 3360c0f

Browse files
committed
ci(conflict): Run the Tango MySQL suite in CI and load its schema locally
1 parent 22b2436 commit 3360c0f

3 files changed

Lines changed: 22 additions & 1 deletion

File tree

‎.github/workflows/ci.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,21 @@ jobs:
312312
with:
313313
target: //test/integration/submitqueue/extension/storage/...
314314

315+
conflict-integration-test:
316+
name: Conflict Extension Test
317+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
318+
runs-on: ubuntu-latest
319+
steps:
320+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
321+
with:
322+
# This job executes untrusted PR code (make build/test/lint). Don't
323+
# leave the GITHUB_TOKEN in the workspace git config while it runs.
324+
persist-credentials: false
325+
- uses: ./.github/actions/setup
326+
- uses: ./.github/actions/run-bazel-test
327+
with:
328+
target: //test/integration/submitqueue/extension/conflict/...
329+
315330
# ---------------------------------------------------------------------------
316331
# CORE TESTS
317332
# ---------------------------------------------------------------------------
@@ -417,6 +432,7 @@ jobs:
417432
- merger-integration-test
418433
- validator-integration-test
419434
- storage-integration-test
435+
- conflict-integration-test
420436
- consumer-integration-test
421437
- web
422438
- web-e2e

‎Makefile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,11 @@ local-init-submitqueue-schemas: ## Manually apply all database schemas
427427
echo " - Applying $$(basename $$file)..."; \
428428
docker exec -i $(SUBMITQUEUE_LOCAL_PROJECT)-mysql-app-1 mysql -uroot -proot submitqueue < $$file 2>&1 | grep -v "Using a password" || true; \
429429
done
430+
@echo "Applying Tango conflict analyzer schema to mysql-app..."
431+
@for file in submitqueue/extension/conflict/tango/mysql/schema/*.sql; do \
432+
echo " - Applying $$(basename $$file)..."; \
433+
docker exec -i $(SUBMITQUEUE_LOCAL_PROJECT)-mysql-app-1 mysql -uroot -proot submitqueue < $$file 2>&1 | grep -v "Using a password" || true; \
434+
done
430435
@echo "Applying queue schema to mysql-queue..."
431436
@for file in platform/extension/messagequeue/mysql/schema/*.sql; do \
432437
echo " - Applying $$(basename $$file)..."; \

‎doc/howto/TESTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ SubmitQueue uses **two separate databases** to demonstrate proper architectural
2323

2424
### 1. Application Database
2525
- **Purpose**: Business data (requests, counters, batches)
26-
- **Schema**: `submitqueue/gateway/extension/storage/mysql/schema`, `submitqueue/orchestrator/extension/storage/mysql/schema`, `platform/extension/counter/mysql/schema`
26+
- **Schema**: `submitqueue/gateway/extension/storage/mysql/schema`, `submitqueue/orchestrator/extension/storage/mysql/schema`, `platform/extension/counter/mysql/schema`, `submitqueue/extension/conflict/tango/mysql/schema`
2727
- **Used by**: Gateway (receipts, request logs, and read models), Orchestrator (requests, batches, builds, and counters)
2828
- **Connection**: `MYSQL_DSN`
2929

0 commit comments

Comments
 (0)