Skip to content

ci(conflict): Run the Tango MySQL suite in CI and load its schema locally #918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
manjari25 wants to merge 1 commit into from
Open

ci(conflict): Run the Tango MySQL suite in CI and load its schema locally #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,21 @@ jobs:
with:
target: //test/integration/submitqueue/extension/storage/...

conflict-integration-test:
name: Conflict Extension Test
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
# This job executes untrusted PR code (make build/test/lint). Don't
# leave the GITHUB_TOKEN in the workspace git config while it runs.
persist-credentials: false
- uses: ./.github/actions/setup
- uses: ./.github/actions/run-bazel-test
with:
target: //test/integration/submitqueue/extension/conflict/...

# ---------------------------------------------------------------------------
# CORE TESTS
# ---------------------------------------------------------------------------
Expand Down Expand Up @@ -417,6 +432,7 @@ jobs:
- merger-integration-test
- validator-integration-test
- storage-integration-test
- conflict-integration-test
- consumer-integration-test
- web
- web-e2e
Expand Down
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,11 @@ local-init-submitqueue-schemas: ## Manually apply all database schemas
echo " - Applying $$(basename $$file)..."; \
docker exec -i $(SUBMITQUEUE_LOCAL_PROJECT)-mysql-app-1 mysql -uroot -proot submitqueue < $$file 2>&1 | grep -v "Using a password" || true; \
done
@echo "Applying Tango conflict analyzer schema to mysql-app..."
@for file in submitqueue/extension/conflict/tango/mysql/schema/*.sql; do \
echo " - Applying $$(basename $$file)..."; \
docker exec -i $(SUBMITQUEUE_LOCAL_PROJECT)-mysql-app-1 mysql -uroot -proot submitqueue < $$file 2>&1 | grep -v "Using a password" || true; \
done
@echo "Applying queue schema to mysql-queue..."
@for file in platform/extension/messagequeue/mysql/schema/*.sql; do \
echo " - Applying $$(basename $$file)..."; \
Expand Down
2 changes: 1 addition & 1 deletion doc/howto/TESTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SubmitQueue uses **two separate databases** to demonstrate proper architectural

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

Expand Down
Loading