Let two backend CI runs share a runner host
The job kept the fixed container names and the fixed 5432 that compose.ci.yml resets for every other job, so a second run could not start. Layering that file leaves the db on a port Docker assigns, which the suite is told about, and the project name is now per run so one teardown cannot take another run's database with it. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01H7LwYgJfpkbLCTeiAf8U4A
This commit is contained in:
@@ -13,13 +13,18 @@ env:
|
|||||||
# The compose files live in docker/, so a bare `docker compose` from the repo
|
# The compose files live in docker/, so a bare `docker compose` from the repo
|
||||||
# root finds nothing. With COMPOSE_FILE set, compose reads .env from the
|
# root finds nothing. With COMPOSE_FILE set, compose reads .env from the
|
||||||
# working directory — the same file the backend settings load as ../.env.
|
# working directory — the same file the backend settings load as ../.env.
|
||||||
# The CI-only project name keeps the `down -v` steps away from a dev stack.
|
# compose.ci.yml drops the fixed container_names and the fixed 5432 — both
|
||||||
COMPOSE_FILE: docker/compose.yml:docker/compose.dev.yml
|
# daemon-global, so without it a second run on the same host cannot start.
|
||||||
COMPOSE_PROJECT_NAME: fluksio-app-ci
|
COMPOSE_FILE: docker/compose.yml:docker/compose.dev.yml:docker/compose.ci.yml
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test-backend:
|
test-backend:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
env:
|
||||||
|
# Per run, so the `down -v` steps reach neither a dev stack nor a run
|
||||||
|
# still going. Unique names cannot be recycled, hence the always-on
|
||||||
|
# teardown below.
|
||||||
|
COMPOSE_PROJECT_NAME: fluksio-app-ci-backend-${{ github.run_id }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -36,14 +41,18 @@ jobs:
|
|||||||
uv.lock
|
uv.lock
|
||||||
- name: Write .env
|
- name: Write .env
|
||||||
# Not committed, and both compose and the backend settings need it.
|
# Not committed, and both compose and the backend settings need it.
|
||||||
# POSTGRES_SERVER=localhost there matches the port db publishes in the
|
# The suite runs on the runner and reaches the container over
|
||||||
# dev overlay, so the suite runs on the runner against the container.
|
# POSTGRES_SERVER=localhost from there, on the port resolved below.
|
||||||
run: cp .env.example .env
|
run: cp .env.example .env
|
||||||
- run: docker compose down -v --remove-orphans
|
- run: docker compose down -v --remove-orphans
|
||||||
# Postgres is the only service the suite needs: the mail paths are
|
# Postgres is the only service the suite needs: the mail paths are
|
||||||
# patched in tests/, and the flow engine falls back to in-memory state
|
# patched in tests/, and the flow engine falls back to in-memory state
|
||||||
# while REDIS_HOST is empty.
|
# while REDIS_HOST is empty.
|
||||||
- run: docker compose up -d --wait db
|
- run: docker compose up -d --wait db
|
||||||
|
- name: Resolve the db port
|
||||||
|
# Docker assigns it (docker/compose.ci.yml), so concurrent runs get one
|
||||||
|
# each. An env var outranks the .env file in the backend settings.
|
||||||
|
run: echo "POSTGRES_PORT=$(docker compose port db 5432 | tail -n1 | cut -d: -f2)" >> "$GITHUB_ENV"
|
||||||
- run: uv sync
|
- run: uv sync
|
||||||
- name: Migrate DB and seed the superuser
|
- name: Migrate DB and seed the superuser
|
||||||
run: uv run bash scripts/prestart.sh
|
run: uv run bash scripts/prestart.sh
|
||||||
|
|||||||
@@ -18,7 +18,11 @@ services:
|
|||||||
|
|
||||||
db:
|
db:
|
||||||
container_name: !reset null
|
container_name: !reset null
|
||||||
ports: !reset []
|
# The one service a job may need from the host: test-backend.yml runs pytest
|
||||||
|
# on the runner. Host side left to Docker, so concurrent jobs get a port
|
||||||
|
# each — `docker compose port db 5432` says which.
|
||||||
|
ports: !override
|
||||||
|
- "5432"
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
container_name: !reset null
|
container_name: !reset null
|
||||||
|
|||||||
Reference in New Issue
Block a user