Lagere die Dev-pytest-Suite in ein Host-Skript aus und wartet auf den Deploy-Checkout.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
parent
b0779859ab
commit
c68bc8d09f
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
*.sh text eol=lf
|
||||||
|
|
@ -17,41 +17,21 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
APP_DIR="$HOME/docker/buyingagent-dev"
|
APP_DIR="$HOME/docker/buyingagent-dev"
|
||||||
COMPOSE_FILE="docker-compose.dev-env.yml"
|
|
||||||
echo "pytest uses Dev Postgres (${APP_DIR}); event=${{ github.event_name }}"
|
echo "pytest uses Dev Postgres (${APP_DIR}); event=${{ github.event_name }}"
|
||||||
cd "$APP_DIR"
|
cd "$APP_DIR"
|
||||||
for i in $(seq 1 60); do
|
for i in $(seq 1 60); do
|
||||||
if [ -f "$APP_DIR/pyproject.toml" ] \
|
if [ -f scripts/ci-pytest.sh ]; then
|
||||||
&& grep -q "api-test:" "$COMPOSE_FILE" \
|
echo "ci-pytest.sh ready (attempt $i)"
|
||||||
&& docker compose -f "$COMPOSE_FILE" exec -T api true 2>/dev/null; then
|
|
||||||
echo "api and test profile ready (attempt $i)"
|
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
if [ "$i" -eq 60 ]; then
|
if [ "$i" -eq 60 ]; then
|
||||||
echo "timeout waiting for Dev checkout/api"
|
echo "timeout waiting for scripts/ci-pytest.sh after Dev deploy"
|
||||||
docker compose -f "$COMPOSE_FILE" ps || true
|
ls -la scripts || true
|
||||||
ls -la "$APP_DIR" || true
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
sleep 5
|
sleep 5
|
||||||
done
|
done
|
||||||
PGUSER="$(docker compose -f "$COMPOSE_FILE" exec -T postgres printenv POSTGRES_USER | tr -d '\r')"
|
sh scripts/ci-pytest.sh
|
||||||
echo "test database buyingagent_test on the existing Dev Postgres (owner ${PGUSER})"
|
|
||||||
docker compose -f "$COMPOSE_FILE" exec -T postgres \
|
|
||||||
psql -U "$PGUSER" -d postgres -v ON_ERROR_STOP=1 \
|
|
||||||
-c "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = 'buyingagent_test' AND pid <> pg_backend_pid();"
|
|
||||||
docker compose -f "$COMPOSE_FILE" exec -T postgres \
|
|
||||||
psql -U "$PGUSER" -d postgres -v ON_ERROR_STOP=1 \
|
|
||||||
-c "DROP DATABASE IF EXISTS buyingagent_test;"
|
|
||||||
docker compose -f "$COMPOSE_FILE" exec -T postgres \
|
|
||||||
psql -U "$PGUSER" -d postgres -v ON_ERROR_STOP=1 \
|
|
||||||
-c "CREATE DATABASE buyingagent_test OWNER ${PGUSER};"
|
|
||||||
docker compose -f "$COMPOSE_FILE" --profile test build --pull=false api-test
|
|
||||||
RUN_OPTS="--rm --no-deps -v ${APP_DIR}:/src:ro -w /src -e PYTHONPATH=/src -e DB_NAME=buyingagent_test -e ENVIRONMENT=test -e ENGINE_BUILD=test"
|
|
||||||
docker compose -f "$COMPOSE_FILE" --profile test run $RUN_OPTS \
|
|
||||||
api-test /app/.venv/bin/alembic upgrade head
|
|
||||||
docker compose -f "$COMPOSE_FILE" --profile test run $RUN_OPTS \
|
|
||||||
api-test /app/.venv/bin/pytest tests -ra --tb=short --cache-dir=/tmp/pytest-cache
|
|
||||||
|
|
||||||
smoke-dev:
|
smoke-dev:
|
||||||
if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}
|
if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}
|
||||||
|
|
|
||||||
61
scripts/ci-pytest.sh
Normal file
61
scripts/ci-pytest.sh
Normal file
|
|
@ -0,0 +1,61 @@
|
||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
APP_DIR="${APP_DIR:-$HOME/docker/buyingagent-dev}"
|
||||||
|
COMPOSE_FILE="${COMPOSE_FILE:-docker-compose.dev-env.yml}"
|
||||||
|
|
||||||
|
echo "pytest uses Dev Postgres (${APP_DIR})"
|
||||||
|
cd "$APP_DIR"
|
||||||
|
|
||||||
|
i=1
|
||||||
|
while [ "$i" -le 60 ]; do
|
||||||
|
if [ -f "$APP_DIR/pyproject.toml" ] \
|
||||||
|
&& grep -q "api-test:" "$COMPOSE_FILE" \
|
||||||
|
&& docker compose -f "$COMPOSE_FILE" exec -T api true >/dev/null 2>&1; then
|
||||||
|
echo "api and test profile ready (attempt $i)"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
if [ "$i" -eq 60 ]; then
|
||||||
|
echo "timeout waiting for Dev checkout/api"
|
||||||
|
docker compose -f "$COMPOSE_FILE" ps || true
|
||||||
|
ls -la "$APP_DIR" || true
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
i=$((i + 1))
|
||||||
|
sleep 5
|
||||||
|
done
|
||||||
|
|
||||||
|
PGUSER="$(docker compose -f "$COMPOSE_FILE" exec -T postgres printenv POSTGRES_USER | tr -d '\r')"
|
||||||
|
echo "test database buyingagent_test on the existing Dev Postgres (owner ${PGUSER})"
|
||||||
|
|
||||||
|
docker compose -f "$COMPOSE_FILE" exec -T postgres \
|
||||||
|
psql -U "$PGUSER" -d postgres -v ON_ERROR_STOP=1 \
|
||||||
|
-c "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = 'buyingagent_test' AND pid <> pg_backend_pid();"
|
||||||
|
|
||||||
|
docker compose -f "$COMPOSE_FILE" exec -T postgres \
|
||||||
|
psql -U "$PGUSER" -d postgres -v ON_ERROR_STOP=1 \
|
||||||
|
-c "DROP DATABASE IF EXISTS buyingagent_test;"
|
||||||
|
|
||||||
|
docker compose -f "$COMPOSE_FILE" exec -T postgres \
|
||||||
|
psql -U "$PGUSER" -d postgres -v ON_ERROR_STOP=1 \
|
||||||
|
-c "CREATE DATABASE buyingagent_test OWNER ${PGUSER};"
|
||||||
|
|
||||||
|
docker compose -f "$COMPOSE_FILE" --profile test build --pull=false api-test
|
||||||
|
|
||||||
|
docker compose -f "$COMPOSE_FILE" --profile test run --rm --no-deps \
|
||||||
|
-v "${APP_DIR}:/src:ro" \
|
||||||
|
-w /src \
|
||||||
|
-e PYTHONPATH=/src \
|
||||||
|
-e DB_NAME=buyingagent_test \
|
||||||
|
-e ENVIRONMENT=test \
|
||||||
|
-e ENGINE_BUILD=test \
|
||||||
|
api-test /app/.venv/bin/alembic upgrade head
|
||||||
|
|
||||||
|
docker compose -f "$COMPOSE_FILE" --profile test run --rm --no-deps \
|
||||||
|
-v "${APP_DIR}:/src:ro" \
|
||||||
|
-w /src \
|
||||||
|
-e PYTHONPATH=/src \
|
||||||
|
-e DB_NAME=buyingagent_test \
|
||||||
|
-e ENVIRONMENT=test \
|
||||||
|
-e ENGINE_BUILD=test \
|
||||||
|
api-test /app/.venv/bin/pytest tests -ra --tb=short --cache-dir=/tmp/pytest-cache
|
||||||
Loading…
Reference in New Issue
Block a user