From 5fc839afbc6b9d2054d7be31f120db2a2db9f87a Mon Sep 17 00:00:00 2001 From: Lars Date: Wed, 28 Oct 2026 13:34:33 +0100 Subject: [PATCH] Run develop tests after the dev deploy, never against production by default. workflow_run uses the workflow file on main and fell through to the prod directory when the triggering name was missing. Dev checks now follow Deploy Dev Stack and target the dev stack explicitly. Co-authored-by: Cursor --- .gitea/workflows/deploy-dev.yml | 105 ++++++++++++++++++++++++++- .gitea/workflows/test.yml | 67 ++++++++++++----- scripts/ci/run-deployed-checks.sh | 116 ++++++++++++++++++++++++++++++ 3 files changed, 268 insertions(+), 20 deletions(-) create mode 100644 scripts/ci/run-deployed-checks.sh diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index d97832c..a25cd79 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -1,4 +1,6 @@ -name: Deploy Development +# Name bewusst nicht "Deploy Development": die Test-Suite auf main lauscht auf +# diesen alten Namen und fällt ohne erkannten Workflow-Namen auf das Prod-Verzeichnis. +name: Deploy Dev Stack on: push: @@ -26,3 +28,104 @@ jobs: echo "✓ DEV API healthy" curl -sf http://localhost:3098/api/version && echo "✓ DEV über Frontend-Nginx (wie Browser) healthy" echo "=== Shinkan DEV Deploy complete ===" + + pytest-backend: + needs: deploy + runs-on: ubuntu-latest + steps: + - name: Backend pytest im Dev-Container + run: sh /home/lars/docker/shinkan-dev/scripts/ci/run-deployed-checks.sh dev pytest + + lint-backend: + needs: deploy + runs-on: ubuntu-latest + steps: + - name: Check backend syntax + run: sh /home/lars/docker/shinkan-dev/scripts/ci/run-deployed-checks.sh dev lint + + build-frontend: + needs: deploy + runs-on: ubuntu-latest + steps: + - name: Build frontend + run: sh /home/lars/docker/shinkan-dev/scripts/ci/run-deployed-checks.sh dev frontend + + k6-health-baseline: + name: k6 /health Baseline + needs: deploy + runs-on: ubuntu-latest + steps: + - name: k6 gegen Dev + run: sh /home/lars/docker/shinkan-dev/scripts/ci/run-deployed-checks.sh dev k6 + + playwright-tests: + needs: deploy + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: "20" + + - name: Dev /health + run: | + BASE="https://dev.shinkan.jinkendo.de" + echo "Warte auf $BASE/health …" + for i in $(seq 1 90); do + if curl -sf "$BASE/health" >/dev/null 2>&1; then + echo "Health OK (Versuch $i)" + exit 0 + fi + sleep 2 + done + echo "Timeout: Dev /health nicht erreichbar" + curl -v "$BASE/health" || true + exit 1 + + - name: Testnutzer registrieren + env: + E2E_DEV_TEST_EMAIL: ${{ secrets.E2E_DEV_TEST_EMAIL }} + E2E_DEV_TEST_PASSWORD: ${{ secrets.E2E_DEV_TEST_PASSWORD }} + run: | + BASE="https://dev.shinkan.jinkendo.de" + if [ -z "$E2E_DEV_TEST_EMAIL" ] || [ -z "$E2E_DEV_TEST_PASSWORD" ]; then + echo "(Registrierung übersprungen — Secrets E2E_DEV_* nicht gesetzt.)" + exit 0 + fi + curl -sf -X POST "$BASE/api/auth/register" \ + -H "Content-Type: application/json" \ + -d "{\"email\":\"${E2E_DEV_TEST_EMAIL}\",\"password\":\"${E2E_DEV_TEST_PASSWORD}\",\"name\":\"Playwright CI\"}" \ + || echo "(Register evtl. schon erfolgt oder Limits — Login-Test gilt trotzdem.)" + + - name: Install Playwright + run: | + npm ci || npm install + npx playwright install --with-deps chromium + + - name: Run Playwright tests + env: + E2E_DEV_TEST_EMAIL: ${{ secrets.E2E_DEV_TEST_EMAIL }} + E2E_DEV_TEST_PASSWORD: ${{ secrets.E2E_DEV_TEST_PASSWORD }} + PLAYWRIGHT_BASE_URL: https://dev.shinkan.jinkendo.de + run: | + set -e + export TEST_EMAIL="$E2E_DEV_TEST_EMAIL" + export TEST_PASSWORD="$E2E_DEV_TEST_PASSWORD" + if [ -z "$TEST_EMAIL" ] || [ -z "$TEST_PASSWORD" ]; then + echo "Fehler: E2E_DEV_TEST_EMAIL und E2E_DEV_TEST_PASSWORD setzen." + exit 1 + fi + mkdir -p screenshots + npx playwright test + echo "Playwright tests passed" + + - name: Upload test screenshots + if: failure() + uses: actions/upload-artifact@v3 + with: + name: playwright-screenshots + path: screenshots/ + retention-days: 7 diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 6278541..a11eded 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -1,15 +1,16 @@ name: Test Suite -# develop: eine Suite, erst nach erfolgreichem Deploy Development (workflow_run). -# Kein push-Trigger: der würde parallel zum Deploy ein zweites Mal starten -# und gegen den noch alten oder gerade neu startenden Stack laufen. -# pull_request: eine Suite vor dem Merge, gegen den zuletzt deployten Dev-Stand. -# main: kein push/PR — Prod-Tests nur via workflow_run nach Deploy Production. +# Dev-Tests hängen an "Deploy Dev Stack" (deploy-dev.yml) und laufen nach dem Deploy +# gegen /home/lars/docker/shinkan-dev. Dieser Workflow hier startet sie nicht noch einmal. +# +# workflow_run läuft mit der Datei auf dem Standardbranch (main). Ein Dev-Deploy darf +# hier nicht landen: ohne erkannten Namen fiel das Skript auf das Prod-Verzeichnis. +# Produktion nur, wenn der auslösende Workflow exakt "Deploy Production" heißt. on: pull_request: branches: [develop] workflow_run: - workflows: ["Deploy Development", "Deploy Production"] + workflows: ["Deploy Production"] types: [completed] jobs: @@ -25,18 +26,24 @@ jobs: REF_NAME="${{ github.ref_name }}" BASE_REF="${{ github.base_ref }}" RUN_WORKFLOW="${{ github.event.workflow_run.name }}" - APP_DIR="/home/lars/docker/shinkan" - COMPOSE_FILE="docker-compose.yml" + HEAD_BRANCH="${{ github.event.workflow_run.head_branch }}" if [ "$EVENT_NAME" = "workflow_run" ]; then - if [ "$RUN_WORKFLOW" = "Deploy Development" ]; then - APP_DIR="/home/lars/docker/shinkan-dev" - COMPOSE_FILE="docker-compose.dev-env.yml" + if [ "$RUN_WORKFLOW" != "Deploy Production" ]; then + echo "workflow_run ist nicht Deploy Production (name=$RUN_WORKFLOW head=$HEAD_BRANCH ref=$REF_NAME)." + echo "Produktion wird nicht angefasst." + exit 1 fi + APP_DIR="/home/lars/docker/shinkan" + COMPOSE_FILE="docker-compose.yml" elif [ "$REF_NAME" = "develop" ] || [ "$BASE_REF" = "develop" ]; then APP_DIR="/home/lars/docker/shinkan-dev" COMPOSE_FILE="docker-compose.dev-env.yml" + else + echo "Kein Dev-Ziel (event=$EVENT_NAME ref=$REF_NAME base=$BASE_REF). Abbruch." + exit 1 fi + echo "CI-Ziel: $APP_DIR ($COMPOSE_FILE)" cd "$APP_DIR" echo "Warte auf stabilen backend-Container …" @@ -70,16 +77,24 @@ jobs: run: | EVENT_NAME="${{ github.event_name }}" REF_NAME="${{ github.ref_name }}" + BASE_REF="${{ github.base_ref }}" RUN_WORKFLOW="${{ github.event.workflow_run.name }}" - APP_DIR="/home/lars/docker/shinkan" + HEAD_BRANCH="${{ github.event.workflow_run.head_branch }}" if [ "$EVENT_NAME" = "workflow_run" ]; then - if [ "$RUN_WORKFLOW" = "Deploy Development" ]; then - APP_DIR="/home/lars/docker/shinkan-dev" + if [ "$RUN_WORKFLOW" != "Deploy Production" ]; then + echo "workflow_run ist nicht Deploy Production (name=$RUN_WORKFLOW head=$HEAD_BRANCH ref=$REF_NAME)." + echo "Produktion wird nicht angefasst." + exit 1 fi - elif [ "$REF_NAME" = "develop" ]; then + APP_DIR="/home/lars/docker/shinkan" + elif [ "$REF_NAME" = "develop" ] || [ "$BASE_REF" = "develop" ]; then APP_DIR="/home/lars/docker/shinkan-dev" + else + echo "Kein Dev-Ziel (event=$EVENT_NAME ref=$REF_NAME base=$BASE_REF). Abbruch." + exit 1 fi + echo "CI-Ziel: $APP_DIR" python3 -m py_compile "$APP_DIR/backend/main.py" echo "✓ Backend syntax OK" @@ -92,16 +107,24 @@ jobs: run: | EVENT_NAME="${{ github.event_name }}" REF_NAME="${{ github.ref_name }}" + BASE_REF="${{ github.base_ref }}" RUN_WORKFLOW="${{ github.event.workflow_run.name }}" - APP_DIR="/home/lars/docker/shinkan" + HEAD_BRANCH="${{ github.event.workflow_run.head_branch }}" if [ "$EVENT_NAME" = "workflow_run" ]; then - if [ "$RUN_WORKFLOW" = "Deploy Development" ]; then - APP_DIR="/home/lars/docker/shinkan-dev" + if [ "$RUN_WORKFLOW" != "Deploy Production" ]; then + echo "workflow_run ist nicht Deploy Production (name=$RUN_WORKFLOW head=$HEAD_BRANCH ref=$REF_NAME)." + echo "Produktion wird nicht angefasst." + exit 1 fi - elif [ "$REF_NAME" = "develop" ]; then + APP_DIR="/home/lars/docker/shinkan" + elif [ "$REF_NAME" = "develop" ] || [ "$BASE_REF" = "develop" ]; then APP_DIR="/home/lars/docker/shinkan-dev" + else + echo "Kein Dev-Ziel (event=$EVENT_NAME ref=$REF_NAME base=$BASE_REF). Abbruch." + exit 1 fi + echo "CI-Ziel: $APP_DIR" cd "$APP_DIR/frontend" npm install @@ -129,6 +152,9 @@ jobs: echo "mode=prod" >> $GITHUB_OUTPUT echo "base_url=https://shinkan.jinkendo.de" >> $GITHUB_OUTPUT echo "→ k6 gegen Prod-Basis." + elif [ "$EVENT" = "workflow_run" ]; then + echo "workflow_run ist nicht Deploy Production (name=$WF_NAME). Abbruch." + exit 1 else echo "mode=dev" >> $GITHUB_OUTPUT echo "base_url=${DEV_BASE}" >> $GITHUB_OUTPUT @@ -219,6 +245,9 @@ jobs: echo "mode=prod" >> $GITHUB_OUTPUT echo "base_url=https://shinkan.jinkendo.de" >> $GITHUB_OUTPUT echo "→ Prod. Secrets: E2E_PROD_TEST_EMAIL / E2E_PROD_TEST_PASSWORD." + elif [ "$EVENT" = "workflow_run" ]; then + echo "workflow_run ist nicht Deploy Production (name=$WF_NAME). Abbruch." + exit 1 else echo "mode=dev" >> $GITHUB_OUTPUT echo "base_url=${DEV_BASE}" >> $GITHUB_OUTPUT diff --git a/scripts/ci/run-deployed-checks.sh b/scripts/ci/run-deployed-checks.sh new file mode 100644 index 0000000..36e1a53 --- /dev/null +++ b/scripts/ci/run-deployed-checks.sh @@ -0,0 +1,116 @@ +#!/bin/sh +# Prüfungen gegen den bereits deployten Stack. Ziel ist Pflicht: dev oder prod. +# Kein Default auf Produktion. +set -eu + +TARGET="${1:-}" +CHECK="${2:-}" + +case "$TARGET" in + dev) + APP_DIR="/home/lars/docker/shinkan-dev" + COMPOSE_FILE="docker-compose.dev-env.yml" + BASE_URL="https://dev.shinkan.jinkendo.de" + HEALTH_TRIES=90 + HEALTH_SLEEP=2 + ;; + prod) + APP_DIR="/home/lars/docker/shinkan" + COMPOSE_FILE="docker-compose.yml" + BASE_URL="https://shinkan.jinkendo.de" + HEALTH_TRIES=60 + HEALTH_SLEEP=5 + ;; + *) + echo "Ziel muss dev oder prod sein, war: '${TARGET}'." >&2 + exit 1 + ;; +esac + +echo "CI-Ziel: $TARGET ($APP_DIR, $BASE_URL), Prüfung: $CHECK" + +wait_health() { + echo "Warte auf $BASE_URL/health …" + i=1 + while [ "$i" -le "$HEALTH_TRIES" ]; do + if curl -sf "$BASE_URL/health" >/dev/null 2>&1; then + echo "Health OK (Versuch $i)" + return 0 + fi + i=$((i + 1)) + sleep "$HEALTH_SLEEP" + done + echo "Timeout: $BASE_URL/health nicht erreichbar" + curl -v "$BASE_URL/health" || true + return 1 +} + +run_pytest() { + cd "$APP_DIR" + echo "Warte auf stabilen backend-Container …" + i=1 + while [ "$i" -le 60 ]; do + if docker compose -f "$COMPOSE_FILE" exec -T backend true 2>/dev/null; then + echo "Backend bereit (Versuch $i)" + break + fi + if [ "$i" -eq 60 ]; then + echo "Timeout: backend-Container nicht bereit" + docker compose -f "$COMPOSE_FILE" ps || true + docker compose -f "$COMPOSE_FILE" logs backend --tail 80 || true + exit 1 + fi + i=$((i + 1)) + sleep 5 + done + docker compose -f "$COMPOSE_FILE" exec -T backend sh -lc " + pip install -r /app/requirements-dev.txt && + cd /app && + ACCESS_LAYER_STRICT=1 python scripts/check_access_layer_hints.py && + python scripts/security_release_checks.py && + ACCESS_LAYER_INTEGRATION=1 TRAINING_PLANNING_INTEGRATION=1 SKIP_DB_MIGRATE=1 python -m pytest tests -m 'not slow' -ra -vv --tb=short + " +} + +run_lint() { + python3 -m py_compile "$APP_DIR/backend/main.py" + echo "Backend syntax OK" +} + +run_frontend() { + cd "$APP_DIR/frontend" + npm install + npm run build + echo "Frontend build OK" +} + +run_k6() { + wait_health + K6_VER="v0.55.0" + ARCH=$(uname -m) + case "$ARCH" in + x86_64) K6_ARCH=amd64 ;; + aarch64|arm64) K6_ARCH=arm64 ;; + *) echo "k6: unbekannte Architektur: $ARCH" >&2; exit 1 ;; + esac + echo "Installing k6 ${K6_VER} linux-${K6_ARCH}" + curl -sSL "https://github.com/grafana/k6/releases/download/${K6_VER}/k6-${K6_VER}-linux-${K6_ARCH}.tar.gz" -o /tmp/k6.tgz + tar -xzf /tmp/k6.tgz -C /tmp + sudo mv "/tmp/k6-${K6_VER}-linux-${K6_ARCH}/k6" /usr/local/bin/k6 + k6 version + cd "$APP_DIR" + echo "k6 gegen BASE_URL=$BASE_URL" + BASE_URL="$BASE_URL" k6 run scripts/load/k6-health-baseline.js + echo "k6 Health-Baseline passed" +} + +case "$CHECK" in + pytest) run_pytest ;; + lint) run_lint ;; + frontend) run_frontend ;; + k6) run_k6 ;; + *) + echo "Prüfung muss pytest, lint, frontend oder k6 sein, war: '${CHECK}'." >&2 + exit 1 + ;; +esac