Compare commits
14 Commits
fix/tracke
...
feature/OR
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
94334bdd42 | ||
| 3b68a29ae1 | |||
|
|
6c1e5fff52 | ||
| d0a34249cc | |||
|
|
1baae81165 | ||
|
|
e856e0940b | ||
|
|
7bbab9c38b | ||
| a33a971c9c | |||
|
|
d0c604bc66 | ||
| 83f5020f94 | |||
|
|
757745a221 | ||
| 34894f4684 | |||
|
|
4e4cc6c724 | ||
| b222d7af27 |
52
.env.staging.example
Normal file
52
.env.staging.example
Normal file
@@ -0,0 +1,52 @@
|
||||
# STAGING env for orchestrator-staging (port 8501).
|
||||
# Plane/Gitea tokens and sandbox project — configured in ORCH-32.
|
||||
# On Stage 1 (ORCH-31) you can copy from prod .env, changing only isolation-related keys.
|
||||
#
|
||||
# DO NOT COMMIT the real .env.staging — this file is the template only.
|
||||
# Create .env.staging on the server and fill in real values before starting staging.
|
||||
|
||||
# ── Plane ─────────────────────────────────────────────────────────────────────
|
||||
ORCH_PLANE_API_URL=http://localhost:8091
|
||||
ORCH_PLANE_API_TOKEN=<plane-api-token>
|
||||
ORCH_PLANE_WORKSPACE_SLUG=<workspace-slug>
|
||||
ORCH_PLANE_WEBHOOK_SECRET=<webhook-secret>
|
||||
|
||||
# Per-agent Plane bot tokens (authorship in Plane comments).
|
||||
# Leave empty to use ORCH_PLANE_API_TOKEN fallback.
|
||||
ORCH_PLANE_BOT_ANALYST=
|
||||
ORCH_PLANE_BOT_ARCHITECT=
|
||||
ORCH_PLANE_BOT_DEVELOPER=
|
||||
ORCH_PLANE_BOT_REVIEWER=
|
||||
ORCH_PLANE_BOT_TESTER=
|
||||
ORCH_PLANE_BOT_DEPLOYER=
|
||||
ORCH_PLANE_BOT_STREAM=
|
||||
|
||||
# ── Gitea ─────────────────────────────────────────────────────────────────────
|
||||
ORCH_GITEA_URL=http://localhost:3000
|
||||
ORCH_GITEA_PUBLIC_URL=https://git.mva154.duckdns.org
|
||||
ORCH_GITEA_TOKEN=<gitea-token>
|
||||
ORCH_GITEA_WEBHOOK_SECRET=<gitea-webhook-secret>
|
||||
|
||||
# ── Telegram ──────────────────────────────────────────────────────────────────
|
||||
ORCH_TELEGRAM_BOT_TOKEN=<telegram-bot-token>
|
||||
ORCH_TELEGRAM_CHAT_ID=<telegram-chat-id>
|
||||
|
||||
# ── Claude / repos ────────────────────────────────────────────────────────────
|
||||
ORCH_CLAUDE_BIN=/usr/bin/claude
|
||||
ORCH_REPOS_DIR=/repos
|
||||
ORCH_HOST_REPOS_DIR=/home/slin/repos
|
||||
|
||||
# ── Database (ISOLATION KEY for staging) ─────────────────────────────────────
|
||||
# The staging volume mounts ./data/staging:/app/data, so the DB physically lives
|
||||
# at ./data/staging/orchestrator.db on the host — fully isolated from prod.
|
||||
# Do NOT change this path; isolation is achieved via the volume mount, not this path.
|
||||
ORCH_DB_PATH=/app/data/orchestrator.db
|
||||
|
||||
# ── Concurrency / worker ──────────────────────────────────────────────────────
|
||||
ORCH_MAX_CONCURRENCY=1
|
||||
ORCH_QUEUE_POLL_INTERVAL=2.0
|
||||
|
||||
# ── Deploy hook ───────────────────────────────────────────────────────────────
|
||||
DEPLOY_SSH_USER=slin
|
||||
DEPLOY_SSH_HOST=127.0.0.1
|
||||
DEPLOY_HOOK_SCRIPT=/home/slin/bin/enduro-deploy-hook.sh
|
||||
22
.gitea/workflows/ci.yml
Normal file
22
.gitea/workflows/ci.yml
Normal file
@@ -0,0 +1,22 @@
|
||||
name: CI
|
||||
on:
|
||||
push:
|
||||
branches: ["feature/**", "bugfix/**", "hotfix/**", "fix/**", "ci/**"]
|
||||
pull_request:
|
||||
branches: [main]
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: self-hosted
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
python3 -m pip install --user --upgrade pip
|
||||
python3 -m pip install --user -r requirements.txt
|
||||
- name: Test
|
||||
env:
|
||||
PYTHONPATH: ${{ github.workspace }}
|
||||
run: |
|
||||
export PATH="$HOME/.local/bin:$PATH"
|
||||
python3 -m pytest tests/ -q
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@@ -5,3 +5,7 @@ __pycache__/
|
||||
data/
|
||||
*.db
|
||||
.pytest_cache/
|
||||
# ORCH-31: staging env (secrets, not committed — see .env.staging.example)
|
||||
.env.staging
|
||||
# ORCH-31: staging DB data directory
|
||||
data/staging/
|
||||
|
||||
@@ -25,3 +25,39 @@ services:
|
||||
- DEPLOY_HOOK_SCRIPT=/home/slin/bin/enduro-deploy-hook.sh
|
||||
group_add:
|
||||
- "999"
|
||||
|
||||
# ORCH-31: staging instance (port 8501, isolated DB).
|
||||
# Starts ONLY with: docker compose --profile staging up -d orchestrator-staging
|
||||
# Normal "docker compose up -d" does NOT start this service.
|
||||
orchestrator-staging:
|
||||
profiles:
|
||||
- staging
|
||||
build: .
|
||||
container_name: orchestrator-staging
|
||||
restart: unless-stopped
|
||||
init: true
|
||||
network_mode: host
|
||||
command: ["uvicorn", "src.main:app", "--host", "0.0.0.0", "--port", "8501"]
|
||||
volumes:
|
||||
- ./data/staging:/app/data
|
||||
- /home/slin/repos:/repos
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
- /usr/lib/node_modules/@anthropic-ai/claude-code:/opt/claude-code:ro
|
||||
- /usr/bin/node:/usr/bin/node:ro
|
||||
- /home/slin/.claude:/home/slin/.claude
|
||||
- /home/slin/.claude.json:/home/slin/.claude.json:ro
|
||||
- /home/slin/.orchestrator-ssh:/root/.ssh:ro
|
||||
env_file: .env.staging
|
||||
environment:
|
||||
- ORCH_REPOS_DIR=/repos
|
||||
- ORCH_HOST_REPOS_DIR=/home/slin/repos
|
||||
- DEPLOY_SSH_USER=slin
|
||||
- DEPLOY_SSH_HOST=127.0.0.1
|
||||
- DEPLOY_HOOK_SCRIPT=/home/slin/bin/enduro-deploy-hook.sh
|
||||
# Staging DB is isolated via ./data/staging volume mount.
|
||||
# Inside the container the path remains /app/data/orchestrator.db (same default),
|
||||
# but on the host it physically lives at ./data/staging/orchestrator.db —
|
||||
# completely separate from prod ./data/orchestrator.db.
|
||||
- ORCH_DB_PATH=/app/data/orchestrator.db
|
||||
group_add:
|
||||
- "999"
|
||||
|
||||
132
docs/PRODUCT_VISION.md
Normal file
132
docs/PRODUCT_VISION.md
Normal file
@@ -0,0 +1,132 @@
|
||||
# Product Vision — Автономная фабрика разработки (Orchestrator)
|
||||
|
||||
> Мультиагентная платформа, которая превращает идею или баг в задеплоенный на прод результат — автономно, надёжно и дёшево.
|
||||
|
||||
**Версия:** 1.0 · **Дата:** 2026-06-04 · **Статус:** концепция развития
|
||||
|
||||
---
|
||||
|
||||
## 1. Зачем это (бизнес-взгляд)
|
||||
|
||||
### Проблема
|
||||
Классическая разработка — это люди-бутылочное-горлышко на каждом шаге: аналитик, архитектор, разработчик, ревьюер, тестировщик, деплой-инженер. Каждая передача задачи между ними — потеря времени, контекста и денег. Мелкая фича или баг едут днями.
|
||||
|
||||
### Решение
|
||||
**Orchestrator** — это конвейер из ИИ-агентов, который проводит задачу через все стадии разработки сам: от бизнес-постановки до релиза на прод. Человек ставит задачу и принимает результат. Всё между — автономно.
|
||||
|
||||
### Ценность
|
||||
- ⚡ **Скорость:** фича проходит полный цикл (анализ → архитектура → код → ревью → тесты → деплой) за ~35 минут без ручных вмешательств.
|
||||
- 💰 **Стоимость:** работа агентов в разы дешевле команды; адаптивный выбор моделей экономит на простых задачах.
|
||||
- 🎯 **Автономность:** 0 ручных пинков в штатном прогоне. Человек — постановщик и приёмщик, а не оператор.
|
||||
- 🛡️ **Надёжность:** многоуровневые гейты качества не пускают недоделку на прод.
|
||||
- 🔁 **Масштаб:** одна платформа ведёт несколько проектов; саму платформу можно тиражировать на новые хосты.
|
||||
|
||||
---
|
||||
|
||||
## 2. Как это работает (обзор)
|
||||
|
||||
### Конвейер
|
||||
```
|
||||
created → analysis → architecture → development → review → testing → deploy → done
|
||||
```
|
||||
На каждом переходе стоит **quality gate** — автоматическая проверка, которая не пускает задачу дальше, пока стадия не выполнена честно:
|
||||
|
||||
| Переход | Гейт | Что проверяет |
|
||||
|---|---|---|
|
||||
| analysis → architecture | check_analysis_approved | BRD/TRZ/AC готовы + апрув человека |
|
||||
| architecture → development | check_architecture_done | Архитектура/ADR зафиксированы |
|
||||
| development → review | check_ci_green | CI зелёный (тесты проходят) |
|
||||
| review → testing | check_reviewer_verdict | Машинный вердикт ревьюера: APPROVED |
|
||||
| testing → deploy | check_tests_passed | Машинный вердикт тестера (не подделать) |
|
||||
| deploy → done | check_deploy_status | Деплой реально успешен, лог в origin/main |
|
||||
|
||||
### Агенты
|
||||
- **Analyst** — собирает бизнес-требования, пишет BRD/TRZ/критерии приёмки.
|
||||
- **Architect** — проектирует решение, фиксирует ADR.
|
||||
- **Developer** — пишет код в изолированном git-worktree.
|
||||
- **Reviewer** — ревьюит, выносит машинный вердикт.
|
||||
- **Tester** — прогоняет тесты, фиксирует результат в отчёте.
|
||||
- **Deployer** — мержит, тегирует, деплоит на прод, пишет deploy-log.
|
||||
|
||||
### Объекты
|
||||
- **Project** — проект в реестре (Plane project ↔ git-репозиторий ↔ префикс задач).
|
||||
- **Work-Item** — задача, проходящая конвейер; на каждой стадии накапливает артефакты (00-business-request … 14-deploy-log).
|
||||
- **Job** — единица работы в очереди (atomic claim, ретраи, restart-safe).
|
||||
|
||||
### Интеграции
|
||||
- **Plane** — управление задачами, статусы как триггеры конвейера, webhooks.
|
||||
- **Gitea** — репозитории, PR, защита main (pre-receive hook).
|
||||
- **Telegram** — живой трекер прогресса, апрувы, уведомления.
|
||||
- **LLM** — модели агентов (сейчас Claude, в планах мультипровайдерность).
|
||||
|
||||
---
|
||||
|
||||
## 3. Что уже сделано (фундамент)
|
||||
|
||||
✅ **Автономный конвейер** — подтверждён живым прогоном: задача от issue до Done без ручных вмешательств (~35 мин).
|
||||
✅ **Очередь задач** — atomic claim, max_concurrency, ретраи, restart-safe.
|
||||
✅ **Изоляция через git-worktree** — каждая задача в своём дереве, без конфликтов в shared-репо.
|
||||
✅ **Машинные гейты качества** — вердикты читаются из структурированных артефактов, а не угадываются по тексту.
|
||||
✅ **Multi-repo** — платформа ведёт несколько проектов (enduro-trails, сам orchestrator).
|
||||
✅ **Идемпотентность webhooks** — дедуп по delivery-id, защита от дублей.
|
||||
✅ **Наблюдаемость** — учёт токенов и стоимости каждой задачи.
|
||||
✅ **Живой Telegram-трекер** — прогресс редактируется в одном сообщении, без спама.
|
||||
|
||||
---
|
||||
|
||||
## 4. Куда движемся (дорожная карта)
|
||||
|
||||
Развитие сгруппировано в 5 стратегических направлений.
|
||||
|
||||
### 🛡️ Надёжность и безопасность
|
||||
- **Post-deploy мониторинг + авто-rollback** — следить за продом после релиза, откатывать при деградации.
|
||||
- **Security-гейт** — secret-scanning + аудит зависимостей перед мержем.
|
||||
- **Бюджетный circuit-breaker** — хард-лимит стоимости на задачу, защита от «убегающих» расходов.
|
||||
- **Опциональная human-приёмка** — финальный взгляд человека для критичных фич.
|
||||
|
||||
### 💰 Экономика и интеллект
|
||||
- **Мультипровайдерность LLM** — Claude, OpenRouter, другие провайдеры на выбор.
|
||||
- **Оценка задачи** — прогноз стоимости/времени до старта.
|
||||
- **Адаптивный выбор модели** — по сложности: тривиальное на дешёвой, сложное на сильной.
|
||||
- **Багфикс-трек** — упрощённый дешёвый путь для багов (без потери качества).
|
||||
|
||||
### 🏗️ Платформа и масштаб
|
||||
- **Self-hosting** — оркестратор пилит сам себя через собственный конвейер.
|
||||
- **Саморазвитие** — петля уроков: ловить отклонения → фиксировать → предлагать улучшения.
|
||||
- **Онбординг проектов** — turnkey-заведение нового проекта в систему.
|
||||
- **Тиражирование** — развернуть платформу на новой инфраструктуре под ключ.
|
||||
|
||||
### 💬 Взаимодействие с человеком
|
||||
- **UX/UI дизайнер** — макеты интерфейсов на этапе аналитики.
|
||||
- **Интерактивный аналитик** — живой диалог для уточнения требований и обсуждения макетов.
|
||||
- **Единые коммент-артефакты** — все агенты прикладывают результаты с кликабельными ссылками.
|
||||
- **Прямые ссылки в Telegram** — апрув в один клик, без блужданий.
|
||||
|
||||
### 🧩 Расширение возможностей
|
||||
- **Тяжёлые расчёты данных** — опциональная стадия для миграций/обработки больших данных.
|
||||
- **Android-разработка** — мобильный стек через тот же конвейер.
|
||||
- **Декомпозиция эпиков** — большая фича → подзадачи → сборка.
|
||||
- **Управление зависимостями** — задача B ждёт задачу A.
|
||||
- **Code coverage gate** — защита покрытия тестами от деградации.
|
||||
- **База знаний проекта** — персистентный контекст для агентов.
|
||||
|
||||
---
|
||||
|
||||
## 5. Принципы (что для нас неизменно)
|
||||
|
||||
1. **Автономность по умолчанию, человек — на ключевых развилках.** Машина делает, человек ставит и принимает.
|
||||
2. **Качество не приносится в жертву скорости/цене.** Удешевляем аналитику — гейты качества остаются. Урок дорого выученный: срезанная проверка = недоделка на проде.
|
||||
3. **Машинные вердикты, а не угадывание.** Гейты читают структурированные поля, а не ищут слова в тексте.
|
||||
4. **Самоизменение — только через PR + ревью + апрув.** Агент, меняющий агентов, всегда под контролем человека.
|
||||
5. **Документация — сразу, не потом.** Изменил функционал → обновил доки.
|
||||
6. **Прод — источник правды.** «Деплой прошёл» ≠ «работает». Проверяем реальный результат.
|
||||
|
||||
---
|
||||
|
||||
## 6. Видение в одну фразу
|
||||
|
||||
> **Самодостаточная фабрика разработки, которая размножается, учится на ошибках, оценивает себя, бережёт бюджет и не ломает прод — превращая намерение человека в работающий продукт почти без его участия.**
|
||||
|
||||
---
|
||||
|
||||
*Документ поддерживается в репозитории orchestrator. Источник дорожной карты — задачи проекта ORCH в Plane (ORCH-7…ORCH-28).*
|
||||
BIN
docs/PRODUCT_VISION.pptx
Normal file
BIN
docs/PRODUCT_VISION.pptx
Normal file
Binary file not shown.
85
docs/STAGING.md
Normal file
85
docs/STAGING.md
Normal file
@@ -0,0 +1,85 @@
|
||||
# Staging Environment (ORCH-31)
|
||||
|
||||
Orchestrator supports a permanent **staging instance** running on port **8501** with a
|
||||
fully-isolated SQLite database. The staging instance shares the same codebase and
|
||||
Dockerfile as production but is started under the `staging` Docker Compose profile so it
|
||||
**never starts accidentally** during a normal `docker compose up -d`.
|
||||
|
||||
## Architecture
|
||||
|
||||
| | Production | Staging |
|
||||
|---|---|---|
|
||||
| Port | 8500 | 8501 |
|
||||
| Container name | `orchestrator` | `orchestrator-staging` |
|
||||
| DB (host path) | `./data/orchestrator.db` | `./data/staging/orchestrator.db` |
|
||||
| DB (container path) | `/app/data/orchestrator.db` | `/app/data/orchestrator.db` |
|
||||
| env file | `.env` | `.env.staging` |
|
||||
| Compose profile | *(default)* | `staging` |
|
||||
|
||||
DB isolation is achieved via a separate volume mount (`./data/staging:/app/data`), not by
|
||||
changing `ORCH_DB_PATH` — the container path stays identical while the host path is a
|
||||
different directory.
|
||||
|
||||
## Prerequisites
|
||||
|
||||
1. **`.env.staging`** — create from the template (see below). This file is **not committed**
|
||||
to the repo (it contains secrets). Copy and fill in values before first start.
|
||||
2. **`./data/staging/`** directory — created automatically on first container start.
|
||||
|
||||
### Create `.env.staging`
|
||||
|
||||
```bash
|
||||
cd /home/slin/repos/orchestrator
|
||||
cp .env.staging.example .env.staging
|
||||
# Edit .env.staging — fill in real tokens / secrets.
|
||||
# At Stage 1 (ORCH-31) you can reuse prod values; sandbox Plane project
|
||||
# and isolated Gitea webhook will be wired in ORCH-32.
|
||||
nano .env.staging
|
||||
```
|
||||
|
||||
## Starting Staging
|
||||
|
||||
```bash
|
||||
cd /home/slin/repos/orchestrator
|
||||
docker compose --profile staging up -d orchestrator-staging
|
||||
```
|
||||
|
||||
Check it is running:
|
||||
|
||||
```bash
|
||||
docker ps | grep orchestrator-staging
|
||||
curl -s http://localhost:8501/health | python3 -m json.tool
|
||||
```
|
||||
|
||||
## Stopping Staging
|
||||
|
||||
```bash
|
||||
docker compose --profile staging stop orchestrator-staging
|
||||
# or remove the container entirely:
|
||||
docker compose --profile staging down orchestrator-staging
|
||||
```
|
||||
|
||||
## Normal `up -d` does NOT start staging
|
||||
|
||||
```bash
|
||||
# This starts ONLY the prod orchestrator (port 8500). Staging is NOT affected.
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
The `profiles: [staging]` directive in `docker-compose.yml` ensures staging is
|
||||
completely invisible to commands that do not pass `--profile staging`.
|
||||
|
||||
## Logs
|
||||
|
||||
```bash
|
||||
docker logs -f orchestrator-staging
|
||||
```
|
||||
|
||||
## Roadmap
|
||||
|
||||
| Task | Description |
|
||||
|---|---|
|
||||
| **ORCH-31** *(this PR)* | Infra: compose service, .env template, gitignore, docs |
|
||||
| **ORCH-32** | Sandbox: isolated Plane project + Gitea repo for staging |
|
||||
| **ORCH-33** | Test suite running against staging endpoint |
|
||||
| **ORCH-34** | Deploy hook: promote `orchestrator:candidate` image to staging |
|
||||
136
docs/STAGING_CHECK.md
Normal file
136
docs/STAGING_CHECK.md
Normal file
@@ -0,0 +1,136 @@
|
||||
# STAGING_CHECK.md — Инструкция по запуску staging check suite (ORCH-33)
|
||||
|
||||
## Что это
|
||||
|
||||
`scripts/staging_check.py` — самостоятельный скрипт проверки **живого** staging-стенда orchestrator (порт 8501). Не unit-тесты — реальные HTTP-вызовы против работающих сервисов.
|
||||
|
||||
Три блока проверок:
|
||||
|
||||
| Блок | Название | Что проверяет |
|
||||
|------|----------|---------------|
|
||||
| A | SMOKE | `/health`, `/queue`, `ORCH_STAGING=true` |
|
||||
| B | ACCESS | Plane sandbox (R), Gitea sandbox (R+push), реестр проектов |
|
||||
| C | E2E | Создать задачу → триггер конвейера → ветка + коммент → cleanup |
|
||||
|
||||
Exit code: **0** = все PASS, **non-zero** = есть FAIL.
|
||||
|
||||
---
|
||||
|
||||
## Требования к окружению
|
||||
|
||||
Скрипт читает токены/URL из env (те же переменные, что использует orchestrator):
|
||||
|
||||
| Переменная | Описание |
|
||||
|-----------|----------|
|
||||
| `ORCH_STAGING` | Должна быть `true` — защита от случайного запуска на проде |
|
||||
| `ORCH_PLANE_API_TOKEN` | Plane API token (`X-API-Key`) |
|
||||
| `ORCH_PLANE_API_URL` | Plane base URL **без** `/api/v1` (скрипт добавляет сам) |
|
||||
| `ORCH_PLANE_WORKSPACE_SLUG` | Workspace slug (`ag_proj`) |
|
||||
| `ORCH_GITEA_TOKEN` | Gitea token (`Authorization: token …`) |
|
||||
| `ORCH_GITEA_URL` | Gitea base URL (`http://localhost:3000`) |
|
||||
| `ORCH_PLANE_WEBHOOK_SECRET` | HMAC-секрет для подписи `/webhook/plane` (если пустой — без подписи) |
|
||||
|
||||
Все эти переменные **уже есть** внутри контейнера `orchestrator-staging`.
|
||||
|
||||
---
|
||||
|
||||
## Способы запуска
|
||||
|
||||
### 1. Внутри контейнера (рекомендуемый)
|
||||
|
||||
```bash
|
||||
docker exec orchestrator-staging \
|
||||
python3 /repos/orchestrator/scripts/staging_check.py --mode stub
|
||||
```
|
||||
|
||||
### 2. С хоста (если есть токены в env)
|
||||
|
||||
```bash
|
||||
export ORCH_STAGING=true
|
||||
export ORCH_PLANE_API_TOKEN=...
|
||||
# ... остальные переменные ...
|
||||
|
||||
python3 scripts/staging_check.py \
|
||||
--base-url http://localhost:8501 \
|
||||
--mode stub
|
||||
```
|
||||
|
||||
### 3. Из docker exec с передачей URL
|
||||
|
||||
```bash
|
||||
docker exec orchestrator-staging \
|
||||
python3 /repos/orchestrator/scripts/staging_check.py \
|
||||
--base-url http://localhost:8501 \
|
||||
--mode stub
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Режимы (`--mode`)
|
||||
|
||||
| Режим | Описание | Скорость |
|
||||
|-------|----------|----------|
|
||||
| `stub` (дефолт) | Проверяет **ранние артефакты** конвейера: ветка + QG-0-коммент. Создаются ДО запуска Claude CLI → быстро, детерминированно, без расхода LLM-кредитов. | ~30-90 сек |
|
||||
| `full-real` | Дополнительно ждёт реального завершения аналитика. Долго, расходует LLM-кредиты. | 5-15+ мин |
|
||||
|
||||
**Текущий дефолт: `stub`** — достаточен для проверки работоспособности стенда.
|
||||
|
||||
---
|
||||
|
||||
## Что проверяет блок C (E2E) и почему это безопасно
|
||||
|
||||
Порядок `start_pipeline` в коде orchestrator:
|
||||
1. Resolve проекта из реестра
|
||||
2. Получить name/description из Plane API (если в webhook пустые)
|
||||
3. **QG-0 гейт** (name ≥ 5 симв, description ≥ 20 симв)
|
||||
4. **Создать work_item_id + ветку в Gitea + начальные доки**
|
||||
5. **Записать строку задачи в БД**
|
||||
6. Поставить аналитика в очередь (вот тут Claude CLI)
|
||||
|
||||
Блок C проверяет **шаги 4-5**, аналитика (шаг 6) **не ждёт**.
|
||||
Тест-задача создаётся ТОЛЬКО в **SANDBOX** (`project_id 8c5a3025-...`),
|
||||
ветка создаётся ТОЛЬКО в **orchestrator-sandbox**.
|
||||
|
||||
### CLEANUP (обязателен)
|
||||
|
||||
`try/finally` гарантирует удаление тестовых артефактов:
|
||||
- Удаляет ветку из `orchestrator-sandbox`
|
||||
- Удаляет задачу из Plane SANDBOX
|
||||
|
||||
Cleanup отрабатывает даже при падении e2e.
|
||||
|
||||
---
|
||||
|
||||
## Принцип HMAC-подписи
|
||||
|
||||
Скрипт читает `ORCH_PLANE_WEBHOOK_SECRET` из env и формирует подпись:
|
||||
```python
|
||||
hmac.new(secret.encode(), body, hashlib.sha256).hexdigest()
|
||||
```
|
||||
Передаёт как заголовок `X-Plane-Signature`. Алгоритм совпадает с `verify_plane_signature` в `src/webhooks/plane.py`.
|
||||
|
||||
---
|
||||
|
||||
## Изолированность от прода
|
||||
|
||||
| Проверка | Гарантия |
|
||||
|---------|---------|
|
||||
| A3 `ORCH_STAGING=true` | При false — abort до деструктивных блоков |
|
||||
| B6 Реестр без боевых | ET/ORCH project_id absent в `known_plane_project_ids()` |
|
||||
| C: only SANDBOX project_id | Webhook payload указывает только `8c5a3025-...` |
|
||||
| C: only orchestrator-sandbox repo | Gitea operations на `admin/orchestrator-sandbox` |
|
||||
| C: cleanup в finally | Артефакты удаляются даже при ошибке |
|
||||
|
||||
---
|
||||
|
||||
## Добавление в деплой-хук
|
||||
|
||||
```bash
|
||||
# В deploy.sh, после docker-compose up -d orchestrator-staging
|
||||
docker exec orchestrator-staging \
|
||||
python3 /repos/orchestrator/scripts/staging_check.py --mode stub
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Staging check FAILED — rolling back"
|
||||
exit 1
|
||||
fi
|
||||
```
|
||||
639
scripts/staging_check.py
Normal file
639
scripts/staging_check.py
Normal file
@@ -0,0 +1,639 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
staging_check.py — Live staging-stand health & e2e check suite (ORCH-33).
|
||||
|
||||
Checks:
|
||||
Block A — SMOKE (health/queue, correct env)
|
||||
Block B — ACCESS (read-only calls to Plane sandbox + Gitea sandbox + registry)
|
||||
Block C — E2E (create task in SANDBOX → trigger pipeline via /webhook/plane
|
||||
→ verify branch + job enqueued → CLEANUP in finally)
|
||||
|
||||
Usage (inside the container or with correct env set):
|
||||
python3 scripts/staging_check.py [--base-url http://localhost:8501] [--mode stub|full-real]
|
||||
|
||||
Exit code: 0 = all PASS, non-zero = at least one FAIL.
|
||||
|
||||
NOTE on modes:
|
||||
stub — default; checks early pipeline artifacts (branch + analyst job
|
||||
enqueued) created BEFORE Claude CLI is invoked.
|
||||
Fast, deterministic, no LLM spend.
|
||||
full-real — additionally waits for the analyst agent to finish (long, costs
|
||||
credits). Not the default.
|
||||
|
||||
NOTE on Plane comments (403):
|
||||
The orchestrator posts the "🔍 Analyst запущен" comment using per-agent bot
|
||||
tokens (ORCH_PLANE_BOT_ANALYST). These bot accounts must be added as members
|
||||
of every Plane project they comment on. In staging the sandbox project was
|
||||
created after the bots were provisioned → the bots are not yet members of
|
||||
SANDBOX → add_comment returns 403 Forbidden.
|
||||
|
||||
This is a known infrastructure limitation of the staging sandbox, NOT a bug
|
||||
in the pipeline itself. C9b therefore verifies pipeline success via the
|
||||
staging job queue (/queue → recent) instead of Plane comments: the analyst
|
||||
job is enqueued BEFORE the add_comment call and its presence in the queue
|
||||
proves the pipeline ran through correctly.
|
||||
"""
|
||||
|
||||
import argparse
|
||||
import hashlib
|
||||
import hmac
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
import datetime
|
||||
import urllib.request
|
||||
import urllib.error
|
||||
import urllib.parse
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Colour helpers
|
||||
# ---------------------------------------------------------------------------
|
||||
_BOLD = "\033[1m"
|
||||
_GREEN = "\033[32m"
|
||||
_RED = "\033[31m"
|
||||
_YELLOW = "\033[33m"
|
||||
_RESET = "\033[0m"
|
||||
|
||||
|
||||
def _ok(msg: str) -> str:
|
||||
return f" {_GREEN}✓ PASS{_RESET} {msg}"
|
||||
|
||||
|
||||
def _fail(msg: str) -> str:
|
||||
return f" {_RED}✗ FAIL{_RESET} {msg}"
|
||||
|
||||
|
||||
def _info(msg: str) -> str:
|
||||
return f" {_YELLOW}·{_RESET} {msg}"
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Low-level HTTP helpers (stdlib only — no requests/httpx in scripts/)
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def _http(method: str, url: str, headers: dict | None = None,
|
||||
body: bytes | None = None, timeout: int = 15) -> tuple[int, bytes]:
|
||||
"""Simple HTTP wrapper. Returns (status_code, response_body)."""
|
||||
req = urllib.request.Request(url, data=body, headers=headers or {}, method=method)
|
||||
try:
|
||||
with urllib.request.urlopen(req, timeout=timeout) as resp:
|
||||
return resp.status, resp.read()
|
||||
except urllib.error.HTTPError as e:
|
||||
return e.code, e.read()
|
||||
except Exception as e:
|
||||
raise RuntimeError(f"{method} {url} → {e}") from e
|
||||
|
||||
|
||||
def _get(url: str, headers: dict | None = None, timeout: int = 15) -> tuple[int, dict]:
|
||||
status, body = _http("GET", url, headers=headers, timeout=timeout)
|
||||
try:
|
||||
data = json.loads(body)
|
||||
except Exception:
|
||||
data = {"_raw": body.decode(errors="replace")}
|
||||
return status, data
|
||||
|
||||
|
||||
def _post(url: str, headers: dict | None = None, payload: dict | None = None,
|
||||
raw_body: bytes | None = None, timeout: int = 15) -> tuple[int, dict]:
|
||||
if raw_body is not None:
|
||||
body = raw_body
|
||||
h = dict(headers or {})
|
||||
if "Content-Type" not in h:
|
||||
h["Content-Type"] = "application/json"
|
||||
else:
|
||||
body = json.dumps(payload or {}).encode()
|
||||
h = dict(headers or {})
|
||||
h["Content-Type"] = "application/json"
|
||||
status, resp_body = _http("POST", url, headers=h, body=body, timeout=timeout)
|
||||
try:
|
||||
data = json.loads(resp_body)
|
||||
except Exception:
|
||||
data = {"_raw": resp_body.decode(errors="replace")}
|
||||
return status, data
|
||||
|
||||
|
||||
def _patch(url: str, headers: dict | None = None, payload: dict | None = None,
|
||||
timeout: int = 15) -> tuple[int, dict]:
|
||||
body = json.dumps(payload or {}).encode()
|
||||
h = dict(headers or {})
|
||||
h["Content-Type"] = "application/json"
|
||||
status, resp_body = _http("PATCH", url, headers=h, body=body, timeout=timeout)
|
||||
try:
|
||||
data = json.loads(resp_body)
|
||||
except Exception:
|
||||
data = {"_raw": resp_body.decode(errors="replace")}
|
||||
return status, data
|
||||
|
||||
|
||||
def _delete(url: str, headers: dict | None = None, timeout: int = 15) -> int:
|
||||
status, _ = _http("DELETE", url, headers=headers, timeout=timeout)
|
||||
return status
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# HMAC helper for /webhook/plane
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def _sign_payload(secret: str, body: bytes) -> str:
|
||||
"""Compute HMAC-SHA256 signature — matches verify_plane_signature in plane.py."""
|
||||
return hmac.new(secret.encode(), body, hashlib.sha256).hexdigest()
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Result tracking
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
class Results:
|
||||
def __init__(self):
|
||||
self._items: list[tuple[str, bool, str]] = [] # (label, passed, detail)
|
||||
|
||||
def add(self, label: str, passed: bool, detail: str = ""):
|
||||
self._items.append((label, passed, detail))
|
||||
line = _ok(label) if passed else _fail(label)
|
||||
if detail:
|
||||
line += f" [{detail}]"
|
||||
print(line)
|
||||
|
||||
def summary(self) -> bool:
|
||||
passed = sum(1 for _, ok, _ in self._items if ok)
|
||||
total = len(self._items)
|
||||
all_ok = passed == total
|
||||
colour = _GREEN if all_ok else _RED
|
||||
print()
|
||||
print(f"{_BOLD}{'='*60}{_RESET}")
|
||||
print(f"{colour}{_BOLD} RESULT: {passed}/{total} checks PASS{_RESET}")
|
||||
print(f"{_BOLD}{'='*60}{_RESET}")
|
||||
return all_ok
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Block A — SMOKE
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def block_a(base: str, results: Results):
|
||||
print(f"\n{_BOLD}[Block A] SMOKE{_RESET}")
|
||||
|
||||
# A1 — /health
|
||||
try:
|
||||
status, data = _get(f"{base}/health")
|
||||
ok = status == 200 and data.get("status") == "ok"
|
||||
results.add("A1 GET /health → 200 status=ok", ok,
|
||||
f"HTTP {status}, body={data}")
|
||||
except Exception as e:
|
||||
results.add("A1 GET /health → 200 status=ok", False, str(e))
|
||||
|
||||
# A2 — /queue
|
||||
try:
|
||||
status, data = _get(f"{base}/queue")
|
||||
ok = (status == 200
|
||||
and "counts" in data
|
||||
and "max_concurrency" in data
|
||||
and "resilience" in data)
|
||||
results.add("A2 GET /queue → 200 with counts/max_concurrency/resilience", ok,
|
||||
f"HTTP {status}, keys={list(data.keys())}")
|
||||
except Exception as e:
|
||||
results.add("A2 GET /queue → 200 with counts/max_concurrency/resilience", False, str(e))
|
||||
|
||||
# A3 — ORCH_STAGING=true in env (guard against hitting prod)
|
||||
staging_flag = os.environ.get("ORCH_STAGING", "").lower()
|
||||
ok = staging_flag == "true"
|
||||
results.add("A3 ORCH_STAGING=true (not prod)", ok,
|
||||
f"ORCH_STAGING={os.environ.get('ORCH_STAGING', '<unset>')}")
|
||||
if not ok:
|
||||
print(_fail(" ⛔ Safety abort: ORCH_STAGING is not 'true'. "
|
||||
"This might be prod. Skipping destructive blocks B/C."))
|
||||
sys.exit(2)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Block B — ACCESS
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
SANDBOX_PROJECT_ID = "8c5a3025-4f9d-4190-b79f-fa06276bb27e"
|
||||
PROD_ET_PROJECT_ID = "7a79f0a9-5278-49cd-9007-9a338f238f9c"
|
||||
PROD_ORCH_PROJECT_ID = "8da6aa25-a60e-44d6-a1e2-d8ae59aa7d6a"
|
||||
|
||||
|
||||
def block_b(results: Results):
|
||||
print(f"\n{_BOLD}[Block B] ACCESS{_RESET}")
|
||||
|
||||
plane_token = os.environ.get("ORCH_PLANE_API_TOKEN", "")
|
||||
plane_base_env = os.environ.get("ORCH_PLANE_API_URL", "http://localhost:8091")
|
||||
# env stores URL WITHOUT /api/v1 — add it ourselves
|
||||
plane_base = plane_base_env.rstrip("/") + "/api/v1"
|
||||
workspace = os.environ.get("ORCH_PLANE_WORKSPACE_SLUG", "ag_proj")
|
||||
gitea_token = os.environ.get("ORCH_GITEA_TOKEN", "")
|
||||
gitea_base = os.environ.get("ORCH_GITEA_URL", "http://localhost:3000")
|
||||
|
||||
plane_headers = {"X-API-Key": plane_token}
|
||||
gitea_headers = {"Authorization": f"token {gitea_token}"}
|
||||
|
||||
# B4 — Plane: list projects, sandbox id present
|
||||
try:
|
||||
url = f"{plane_base}/workspaces/{workspace}/projects/"
|
||||
status, data = _get(url, headers=plane_headers)
|
||||
if status == 200:
|
||||
# API may return a list or {"results": [...]}
|
||||
projects = data.get("results", data) if isinstance(data, dict) else data
|
||||
if isinstance(projects, list):
|
||||
ids = {p.get("id", "") for p in projects}
|
||||
else:
|
||||
ids = set()
|
||||
ok = SANDBOX_PROJECT_ID in ids
|
||||
results.add("B4 Plane: sandbox project accessible", ok,
|
||||
f"HTTP {status}, found {len(ids)} project(s), sandbox={'YES' if ok else 'NO'}")
|
||||
else:
|
||||
results.add("B4 Plane: sandbox project accessible", False,
|
||||
f"HTTP {status}")
|
||||
except Exception as e:
|
||||
results.add("B4 Plane: sandbox project accessible", False, str(e))
|
||||
|
||||
# B5 — Gitea: sandbox repo accessible, push=true
|
||||
try:
|
||||
url = f"{gitea_base}/api/v1/repos/admin/orchestrator-sandbox"
|
||||
status, data = _get(url, headers=gitea_headers)
|
||||
push_ok = data.get("permissions", {}).get("push", False) if status == 200 else False
|
||||
ok = status == 200 and push_ok
|
||||
results.add("B5 Gitea: orchestrator-sandbox accessible, push=true", ok,
|
||||
f"HTTP {status}, permissions={data.get('permissions')}")
|
||||
except Exception as e:
|
||||
results.add("B5 Gitea: orchestrator-sandbox accessible, push=true", False, str(e))
|
||||
|
||||
# B6 — Registry: sandbox in known IDs, prod ET/ORCH NOT in known IDs
|
||||
try:
|
||||
# Import from inside the container (script runs in /repos/orchestrator context)
|
||||
sys.path.insert(0, "/repos/orchestrator")
|
||||
# Force reload to pick up container env
|
||||
import importlib
|
||||
if "src.projects" in sys.modules:
|
||||
importlib.reload(sys.modules["src.projects"])
|
||||
from src.projects import known_plane_project_ids
|
||||
known = known_plane_project_ids()
|
||||
sandbox_present = SANDBOX_PROJECT_ID in known
|
||||
et_absent = PROD_ET_PROJECT_ID not in known
|
||||
orch_absent = PROD_ORCH_PROJECT_ID not in known
|
||||
ok = sandbox_present and et_absent and orch_absent
|
||||
detail = (
|
||||
f"sandbox={'YES' if sandbox_present else 'NO'}, "
|
||||
f"prod-ET={'NO(good)' if et_absent else 'YES(BAD!)'}, "
|
||||
f"prod-ORCH={'NO(good)' if orch_absent else 'YES(BAD!)'}"
|
||||
)
|
||||
results.add("B6 Registry: sandbox present, prod ET/ORCH absent", ok, detail)
|
||||
except Exception as e:
|
||||
results.add("B6 Registry: sandbox present, prod ET/ORCH absent", False, str(e))
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Block C — E2E
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
IN_PROGRESS_STATE_ID = "b873d9eb-993c-48cd-97ac-99a9b1623967"
|
||||
|
||||
# Path to staging SQLite DB inside the container
|
||||
STAGING_DB_PATH = os.environ.get("ORCH_DB_PATH", "/app/data/orchestrator.db")
|
||||
|
||||
|
||||
def _make_webhook_payload(issue_id: str, issue_name: str, issue_desc: str) -> dict:
|
||||
"""Build the minimal webhook payload that triggers start_pipeline."""
|
||||
return {
|
||||
"event": "issue",
|
||||
"action": "updated",
|
||||
"data": {
|
||||
"id": issue_id,
|
||||
"name": issue_name,
|
||||
"description_stripped": issue_desc,
|
||||
"project": SANDBOX_PROJECT_ID,
|
||||
"state": {
|
||||
"id": IN_PROGRESS_STATE_ID,
|
||||
"name": "In Progress",
|
||||
"group": "started",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def _poll(fn, timeout: int = 60, interval: int = 3, label: str = ""):
|
||||
"""Poll fn() until it returns truthy or timeout expires."""
|
||||
deadline = time.time() + timeout
|
||||
while time.time() < deadline:
|
||||
result = fn()
|
||||
if result:
|
||||
return result
|
||||
if label:
|
||||
print(_info(f" waiting... ({label})"))
|
||||
time.sleep(interval)
|
||||
return None
|
||||
|
||||
|
||||
def _cleanup_staging_db(plane_issue_id: str):
|
||||
"""Delete the test task row from staging SQLite DB."""
|
||||
if not plane_issue_id:
|
||||
print(_info("CLEANUP DB: no issue_id to clean"))
|
||||
return
|
||||
try:
|
||||
import sqlite3
|
||||
conn = sqlite3.connect(STAGING_DB_PATH)
|
||||
cur = conn.execute(
|
||||
"DELETE FROM tasks WHERE plane_id = ?", (plane_issue_id,)
|
||||
)
|
||||
deleted = cur.rowcount
|
||||
conn.commit()
|
||||
conn.close()
|
||||
if deleted:
|
||||
print(_ok(f"CLEANUP DB: deleted {deleted} task row(s) for plane_id={plane_issue_id}"))
|
||||
else:
|
||||
print(_info(f"CLEANUP DB: no task row found for plane_id={plane_issue_id}"))
|
||||
except Exception as e:
|
||||
print(_fail(f"CLEANUP DB: error: {e}"))
|
||||
|
||||
|
||||
def _cleanup_staging_jobs(plane_issue_id: str):
|
||||
"""Delete job queue rows for the test task from staging SQLite DB."""
|
||||
if not plane_issue_id:
|
||||
return
|
||||
try:
|
||||
import sqlite3
|
||||
conn = sqlite3.connect(STAGING_DB_PATH)
|
||||
# Find task ids for this plane_id first
|
||||
task_rows = conn.execute(
|
||||
"SELECT id FROM tasks WHERE plane_id = ?", (plane_issue_id,)
|
||||
).fetchall()
|
||||
if task_rows:
|
||||
task_ids = [r[0] for r in task_rows]
|
||||
placeholders = ",".join("?" * len(task_ids))
|
||||
cur = conn.execute(
|
||||
f"DELETE FROM jobs WHERE task_id IN ({placeholders})", task_ids
|
||||
)
|
||||
deleted = cur.rowcount
|
||||
conn.commit()
|
||||
if deleted:
|
||||
print(_ok(f"CLEANUP DB: deleted {deleted} job row(s) for task_ids={task_ids}"))
|
||||
conn.close()
|
||||
except Exception as e:
|
||||
print(_fail(f"CLEANUP DB jobs: error: {e}"))
|
||||
|
||||
|
||||
def _cleanup_dedup(plane_issue_id: str, wh_body_sha: str | None = None):
|
||||
"""Remove dedup event entries for the test webhook delivery."""
|
||||
if not wh_body_sha:
|
||||
return
|
||||
try:
|
||||
import sqlite3
|
||||
conn = sqlite3.connect(STAGING_DB_PATH)
|
||||
cur = conn.execute(
|
||||
"DELETE FROM events_dedup WHERE delivery_id = ?", (wh_body_sha,)
|
||||
)
|
||||
deleted = cur.rowcount
|
||||
conn.commit()
|
||||
conn.close()
|
||||
if deleted:
|
||||
print(_ok(f"CLEANUP DB: removed {deleted} dedup entry"))
|
||||
except Exception as e:
|
||||
# dedup table might not exist or different schema — not critical
|
||||
print(_info(f"CLEANUP DB dedup: {e}"))
|
||||
|
||||
|
||||
def block_c(base: str, results: Results, mode: str):
|
||||
print(f"\n{_BOLD}[Block C] E2E (mode={mode}){_RESET}")
|
||||
|
||||
plane_token = os.environ.get("ORCH_PLANE_API_TOKEN", "")
|
||||
plane_base_env = os.environ.get("ORCH_PLANE_API_URL", "http://localhost:8091")
|
||||
plane_base = plane_base_env.rstrip("/") + "/api/v1"
|
||||
workspace = os.environ.get("ORCH_PLANE_WORKSPACE_SLUG", "ag_proj")
|
||||
gitea_token = os.environ.get("ORCH_GITEA_TOKEN", "")
|
||||
gitea_base = os.environ.get("ORCH_GITEA_URL", "http://localhost:3000")
|
||||
webhook_secret = os.environ.get("ORCH_PLANE_WEBHOOK_SECRET", "")
|
||||
|
||||
plane_headers = {"X-API-Key": plane_token}
|
||||
gitea_headers = {"Authorization": f"token {gitea_token}"}
|
||||
|
||||
ts = datetime.datetime.now(datetime.timezone.utc).strftime("%Y%m%dT%H%M%S")
|
||||
issue_name = f"[staging-check] e2e {ts}"
|
||||
issue_desc = (
|
||||
"Automated e2e check created by staging_check.py. "
|
||||
"This task tests the live staging pipeline end-to-end. "
|
||||
"Safe to delete — cleanup runs in finally block."
|
||||
)
|
||||
|
||||
issue_id = None
|
||||
branch_name = None
|
||||
wh_body_bytes = None
|
||||
|
||||
try:
|
||||
# C7 — Create task in Plane SANDBOX
|
||||
print(_info(f"C7: Creating issue in SANDBOX project..."))
|
||||
url = f"{plane_base}/workspaces/{workspace}/projects/{SANDBOX_PROJECT_ID}/issues/"
|
||||
status, data = _post(url, headers=plane_headers, payload={
|
||||
"name": issue_name,
|
||||
"description_html": f"<p>{issue_desc}</p>",
|
||||
"description_stripped": issue_desc,
|
||||
})
|
||||
issue_id = data.get("id")
|
||||
ok = status in (200, 201) and bool(issue_id)
|
||||
results.add("C7 Create issue in Plane SANDBOX", ok,
|
||||
f"HTTP {status}, issue_id={issue_id}")
|
||||
if not ok:
|
||||
print(_fail(f" Cannot continue C8-C9 without issue. body={data}"))
|
||||
results.add("C8 Trigger pipeline via /webhook/plane", False, "skipped: C7 failed")
|
||||
results.add("C9a Branch appears in orchestrator-sandbox", False, "skipped")
|
||||
results.add("C9b Analyst job enqueued in staging queue", False, "skipped")
|
||||
return
|
||||
|
||||
# Small delay to let Plane finish persisting the issue
|
||||
time.sleep(2)
|
||||
|
||||
# C8 — Trigger pipeline via direct POST to /webhook/plane
|
||||
print(_info(f"C8: Triggering pipeline via POST /webhook/plane ..."))
|
||||
wh_payload = _make_webhook_payload(issue_id, issue_name, issue_desc)
|
||||
wh_body_bytes = json.dumps(wh_payload).encode()
|
||||
|
||||
wh_headers = {"Content-Type": "application/json"}
|
||||
if webhook_secret:
|
||||
sig = _sign_payload(webhook_secret, wh_body_bytes)
|
||||
wh_headers["X-Plane-Signature"] = sig
|
||||
print(_info(f" Using HMAC signature (secret len={len(webhook_secret)})"))
|
||||
else:
|
||||
print(_info(" No webhook secret configured, sending without signature"))
|
||||
|
||||
status, resp = _post(f"{base}/webhook/plane",
|
||||
headers=wh_headers,
|
||||
raw_body=wh_body_bytes)
|
||||
ok = status == 200 and resp.get("status") in ("accepted",)
|
||||
results.add("C8 Trigger pipeline via /webhook/plane", ok,
|
||||
f"HTTP {status}, resp={resp}")
|
||||
if not ok:
|
||||
print(_fail(f" Pipeline trigger failed. Cannot verify C9."))
|
||||
results.add("C9a Branch appears in orchestrator-sandbox", False, "skipped: C8 failed")
|
||||
results.add("C9b Analyst job enqueued in staging queue", False, "skipped: C8 failed")
|
||||
return
|
||||
|
||||
# C9a — Poll for branch in Gitea orchestrator-sandbox
|
||||
print(_info("C9a: Polling for branch in orchestrator-sandbox (up to 60s)..."))
|
||||
|
||||
def _check_branch():
|
||||
try:
|
||||
burl = f"{gitea_base}/api/v1/repos/admin/orchestrator-sandbox/branches"
|
||||
s, bdata = _get(burl, headers=gitea_headers)
|
||||
if s != 200:
|
||||
return None
|
||||
branches = bdata if isinstance(bdata, list) else bdata.get("results", [])
|
||||
for b in branches:
|
||||
bname = b.get("name", "")
|
||||
# Branch name: feature/SANDBOX-NNN-staging-check-...
|
||||
if "feature/" in bname and "staging-check" in bname:
|
||||
return bname
|
||||
return None
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
branch_name = _poll(_check_branch, timeout=60, interval=3,
|
||||
label="waiting for branch")
|
||||
ok = bool(branch_name)
|
||||
results.add("C9a Branch appears in orchestrator-sandbox", ok,
|
||||
f"branch={branch_name or 'not found'}")
|
||||
|
||||
# C9b — Verify analyst job was enqueued via staging /queue
|
||||
# NOTE: The orchestrator posts a "🔍 Analyst запущен" comment to Plane using
|
||||
# per-agent bot tokens (ORCH_PLANE_BOT_ANALYST). In staging, the sandbox
|
||||
# project was created after the bot accounts were provisioned, so the bots are
|
||||
# not yet members of the SANDBOX project → add_comment returns 403 Forbidden.
|
||||
# This is a known staging infrastructure limitation (not a pipeline bug).
|
||||
# We therefore verify pipeline success via /queue (recent jobs): the analyst
|
||||
# job is enqueued BEFORE the add_comment call, so its presence in the queue
|
||||
# confirms the pipeline ran through to job dispatch.
|
||||
print(_info("C9b: Checking staging job queue for analyst job (up to 30s)..."))
|
||||
print(_info(" (Plane comment check skipped: bot-tokens not added to SANDBOX project)"))
|
||||
|
||||
def _check_queue():
|
||||
try:
|
||||
s, qdata = _get(f"{base}/queue")
|
||||
if s != 200:
|
||||
return None
|
||||
recent = qdata.get("recent", [])
|
||||
for job in recent:
|
||||
if (job.get("agent") == "analyst"
|
||||
and job.get("repo") == "orchestrator-sandbox"
|
||||
and issue_name in (job.get("task_content") or "")):
|
||||
return job
|
||||
return None
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
analyst_job = _poll(_check_queue, timeout=30, interval=2,
|
||||
label="waiting for analyst job in queue")
|
||||
ok = bool(analyst_job)
|
||||
detail = ""
|
||||
if analyst_job:
|
||||
detail = (f"job_id={analyst_job.get('id')}, "
|
||||
f"status={analyst_job.get('status')}, "
|
||||
f"agent={analyst_job.get('agent')}")
|
||||
results.add("C9b Analyst job enqueued in staging queue", ok, detail)
|
||||
|
||||
finally:
|
||||
# C10 — CLEANUP (always runs)
|
||||
print(f"\n{_BOLD}[CLEANUP]{_RESET}")
|
||||
_cleanup(
|
||||
plane_base=plane_base,
|
||||
workspace=workspace,
|
||||
gitea_base=gitea_base,
|
||||
plane_headers=plane_headers,
|
||||
gitea_headers=gitea_headers,
|
||||
issue_id=issue_id,
|
||||
branch_name=branch_name,
|
||||
wh_body_bytes=wh_body_bytes,
|
||||
)
|
||||
|
||||
|
||||
def _cleanup(plane_base, workspace, gitea_base, plane_headers, gitea_headers,
|
||||
issue_id, branch_name, wh_body_bytes=None):
|
||||
"""Delete test branch in Gitea, test issue in Plane SANDBOX, and DB rows."""
|
||||
|
||||
# Delete branch in Gitea
|
||||
if branch_name:
|
||||
try:
|
||||
burl = (f"{gitea_base}/api/v1/repos/admin/orchestrator-sandbox"
|
||||
f"/branches/{urllib.parse.quote(branch_name, safe='')}")
|
||||
s = _delete(burl, headers=gitea_headers)
|
||||
if s in (200, 204, 404):
|
||||
print(_ok(f"CLEANUP: deleted branch {branch_name!r} (HTTP {s})"))
|
||||
else:
|
||||
print(_fail(f"CLEANUP: delete branch returned HTTP {s}"))
|
||||
except Exception as e:
|
||||
print(_fail(f"CLEANUP: delete branch error: {e}"))
|
||||
else:
|
||||
print(_info("CLEANUP: no branch to delete"))
|
||||
|
||||
# Delete issue in Plane SANDBOX
|
||||
if issue_id:
|
||||
try:
|
||||
iurl = (f"{plane_base}/workspaces/{workspace}/projects/"
|
||||
f"{SANDBOX_PROJECT_ID}/issues/{issue_id}/")
|
||||
s = _delete(iurl, headers=plane_headers)
|
||||
if s in (200, 204, 404):
|
||||
print(_ok(f"CLEANUP: deleted Plane issue {issue_id} (HTTP {s})"))
|
||||
else:
|
||||
print(_fail(f"CLEANUP: delete Plane issue returned HTTP {s}"))
|
||||
except Exception as e:
|
||||
print(_fail(f"CLEANUP: delete Plane issue error: {e}"))
|
||||
else:
|
||||
print(_info("CLEANUP: no issue to delete"))
|
||||
|
||||
# Delete task + jobs from staging DB
|
||||
if issue_id:
|
||||
_cleanup_staging_jobs(issue_id)
|
||||
_cleanup_staging_db(issue_id)
|
||||
|
||||
# Remove dedup entry so future re-runs with same body don't get "duplicate"
|
||||
if wh_body_bytes is not None:
|
||||
import hashlib as _hl
|
||||
dedup_id = "plane" + _hl.sha256(b"plane" + wh_body_bytes).hexdigest()
|
||||
_cleanup_dedup(issue_id, dedup_id)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Main
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(
|
||||
description="Live staging-stand check suite (ORCH-33)"
|
||||
)
|
||||
parser.add_argument(
|
||||
"--base-url",
|
||||
default="http://localhost:8501",
|
||||
help="Base URL of the staging orchestrator (default: http://localhost:8501)",
|
||||
)
|
||||
parser.add_argument(
|
||||
"--mode",
|
||||
choices=["stub", "full-real"],
|
||||
default="stub",
|
||||
help=(
|
||||
"stub (default): check early pipeline artifacts only (branch+job), "
|
||||
"no LLM spend. "
|
||||
"full-real: also wait for the analyst agent (slow, costs credits)."
|
||||
),
|
||||
)
|
||||
args = parser.parse_args()
|
||||
|
||||
base = args.base_url.rstrip("/")
|
||||
|
||||
print(f"{_BOLD}{'='*60}{_RESET}")
|
||||
print(f"{_BOLD} ORCH-33 Staging Check Suite{_RESET}")
|
||||
print(f" base_url : {base}")
|
||||
print(f" mode : {args.mode}")
|
||||
print(f" utc_time : {datetime.datetime.now(datetime.timezone.utc).isoformat()}")
|
||||
print(f"{_BOLD}{'='*60}{_RESET}")
|
||||
|
||||
results = Results()
|
||||
|
||||
block_a(base, results)
|
||||
block_b(results)
|
||||
block_c(base, results, args.mode)
|
||||
|
||||
all_ok = results.summary()
|
||||
sys.exit(0 if all_ok else 1)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
173
src/qg/checks.py
173
src/qg/checks.py
@@ -2,6 +2,7 @@
|
||||
|
||||
import os
|
||||
import logging
|
||||
import subprocess
|
||||
import httpx
|
||||
from ..config import settings
|
||||
|
||||
@@ -137,7 +138,16 @@ def check_review_approved(repo: str, pr_number: int) -> tuple[bool, str]:
|
||||
|
||||
def check_tests_passed(repo: str, work_item_id: str, branch: str | None = None) -> tuple[bool, str]:
|
||||
"""
|
||||
Check if test report exists and contains PASS indicator.
|
||||
Gate the testing -> deploy transition on the tester's MACHINE-READABLE verdict
|
||||
in 13-test-report.md frontmatter, NOT on a naive substring search of the body.
|
||||
|
||||
ET-013 fix: the previous implementation did `if "PASS" in content`, so a report
|
||||
explicitly marked `verdict: BLOCKED` / `status: blocked` but whose prose mentioned
|
||||
"23 passed" / "✅ PASS" / "All checks passed" was treated as a pass, and an
|
||||
unfinished feature reached Done. This mirrors check_reviewer_verdict (S-5) and
|
||||
check_deploy_status (БАГ 8): read ONLY the YAML frontmatter `verdict:` / `status:`
|
||||
fields, never the body.
|
||||
|
||||
File: docs/work-items/<work_item_id>/13-test-report.md
|
||||
"""
|
||||
repo_path = _repo_path(repo, branch)
|
||||
@@ -149,12 +159,67 @@ def check_tests_passed(repo: str, work_item_id: str, branch: str | None = None)
|
||||
try:
|
||||
with open(report_path, "r") as f:
|
||||
content = f.read()
|
||||
if "PASS" in content or "All tests passed" in content:
|
||||
return True, "Test report indicates PASS"
|
||||
return False, "Test report exists but no PASS indicator found"
|
||||
except OSError as e:
|
||||
return False, f"Error reading test report: {e}"
|
||||
|
||||
return _parse_tests_verdict(content)
|
||||
|
||||
|
||||
# Positive / negative verdict tokens, derived from REAL tester reports in
|
||||
# enduro-trails (ET-001..ET-014). The tester is inconsistent: most write
|
||||
# `verdict: PASS`, but ET-006 used `verdict: ready-to-deploy` (with `status: PASSED`),
|
||||
# ET-007 `verdict: PASS — ready-to-deploy`, ET-008 `verdict: stage:ready-to-deploy`
|
||||
# (with `status: pass`). ET-013 (the bug) used `verdict: BLOCKED` / `status: blocked`.
|
||||
# We therefore match known positive/negative TOKENS inside the normalized
|
||||
# verdict/status fields, and treat a negative token as authoritative (a BLOCKED/FAILED
|
||||
# report never passes, even if another field looks positive).
|
||||
_TESTS_NEGATIVE_TOKENS = ("BLOCKED", "FAILED", "FAIL", "REQUEST_CHANGES", "REJECT", "RED")
|
||||
_TESTS_POSITIVE_TOKENS = ("PASSED", "PASS", "READY-TO-DEPLOY", "READY_TO_DEPLOY", "GREEN", "APPROVED")
|
||||
|
||||
|
||||
def _parse_tests_verdict(content: str) -> tuple[bool, str]:
|
||||
"""Map a 13-test-report.md body to a quality-gate verdict by reading ONLY the
|
||||
machine-readable `verdict:` (and corroborating `status:`) YAML frontmatter fields.
|
||||
|
||||
Rules:
|
||||
- No frontmatter / bad YAML / neither field present -> (False, reason).
|
||||
- A negative token (BLOCKED/FAILED/...) in verdict OR status -> (False) and is
|
||||
authoritative (ET-013 main case: verdict BLOCKED wins over any prose PASS).
|
||||
- Otherwise a positive token (PASS/PASSED/READY-TO-DEPLOY/...) in verdict OR
|
||||
status -> (True).
|
||||
- Anything else (unrecognized / empty verdict) -> (False, reason).
|
||||
"""
|
||||
import yaml
|
||||
|
||||
if not content.startswith("---"):
|
||||
return False, "No YAML frontmatter in test report (cannot read machine verdict)"
|
||||
|
||||
parts = content.split("---", 2)
|
||||
if len(parts) < 3:
|
||||
return False, "Malformed YAML frontmatter in test report"
|
||||
|
||||
try:
|
||||
fm = yaml.safe_load(parts[1]) or {}
|
||||
except yaml.YAMLError as e:
|
||||
return False, f"Invalid YAML frontmatter in test report: {e}"
|
||||
if not isinstance(fm, dict):
|
||||
return False, "Malformed YAML frontmatter in test report (not a mapping)"
|
||||
|
||||
verdict = str(fm.get("verdict", "") or "").upper().strip()
|
||||
status = str(fm.get("status", "") or "").upper().strip()
|
||||
|
||||
if not verdict and not status:
|
||||
return False, "No machine-readable verdict/status in test report frontmatter"
|
||||
|
||||
fields = f"{verdict} {status}"
|
||||
for neg in _TESTS_NEGATIVE_TOKENS:
|
||||
if neg in fields:
|
||||
return False, f"Test verdict: {verdict or status} ({neg})"
|
||||
for pos in _TESTS_POSITIVE_TOKENS:
|
||||
if pos in fields:
|
||||
return True, f"Test verdict: {verdict or status} (PASS)"
|
||||
|
||||
return False, f"No recognized PASS verdict in frontmatter (verdict={verdict!r}, status={status!r})"
|
||||
|
||||
|
||||
def check_analysis_approved(repo: str, work_item_id: str, branch: str | None = None) -> tuple[bool, str]:
|
||||
@@ -281,6 +346,64 @@ def check_tests_local(repo: str, branch: str) -> tuple[bool, str]:
|
||||
return False, f"Local test run error: {e}"
|
||||
|
||||
|
||||
def _parse_deploy_status(content: str) -> tuple[bool, str]:
|
||||
"""Parse a 14-deploy-log.md body and map its `deploy_status:` frontmatter to a
|
||||
quality-gate verdict. Reads ONLY the machine-readable YAML field, never prose.
|
||||
|
||||
deploy_status: SUCCESS -> (True, "Deploy status: SUCCESS")
|
||||
deploy_status: FAILED -> (False, "Deploy status: FAILED")
|
||||
missing field / no frontmatter / bad YAML -> (False, <reason>)
|
||||
"""
|
||||
import yaml
|
||||
status = None
|
||||
if content.startswith("---"):
|
||||
parts = content.split("---", 2)
|
||||
if len(parts) >= 3:
|
||||
try:
|
||||
fm = yaml.safe_load(parts[1]) or {}
|
||||
except yaml.YAMLError as e:
|
||||
return False, f"Invalid YAML frontmatter in deploy log: {e}"
|
||||
status = str(fm.get("deploy_status", "")).upper().strip()
|
||||
if status == "SUCCESS":
|
||||
return True, "Deploy status: SUCCESS"
|
||||
if status == "FAILED":
|
||||
return False, "Deploy status: FAILED"
|
||||
return False, f"No machine-readable deploy_status in frontmatter (got: {status!r})"
|
||||
|
||||
|
||||
def _deploy_log_from_main(repo: str, work_item_id: str) -> str | None:
|
||||
"""Best-effort read of 14-deploy-log.md from origin/main on the shared clone.
|
||||
|
||||
The deployer writes 14-deploy-log.md and merges the deploy artifacts into main
|
||||
via a separate PR (see ET-013), so the file lands in origin/main, NOT in the
|
||||
feature branch worktree the gate normally reads. This recovers it from main.
|
||||
|
||||
Degrades gracefully: any git failure (no clone, network/fetch error, file
|
||||
absent in main) returns None instead of raising, so the caller falls back to
|
||||
the plain "not found" verdict. Never raises.
|
||||
"""
|
||||
repo_clone = os.path.join(settings.repos_dir, repo)
|
||||
if not os.path.isdir(os.path.join(repo_clone, ".git")):
|
||||
return None
|
||||
rel = f"docs/work-items/{work_item_id}/14-deploy-log.md"
|
||||
try:
|
||||
# Refresh origin/main so we see freshly-merged deploy artifacts.
|
||||
subprocess.run(
|
||||
["git", "-C", repo_clone, "fetch", "origin", "main"],
|
||||
check=False, capture_output=True, timeout=30,
|
||||
)
|
||||
show = subprocess.run(
|
||||
["git", "-C", repo_clone, "show", f"origin/main:{rel}"],
|
||||
check=False, capture_output=True, text=True, timeout=15,
|
||||
)
|
||||
except (subprocess.SubprocessError, OSError) as e:
|
||||
logger.warning("deploy-log origin/main lookup failed for %s/%s: %s", repo, work_item_id, e)
|
||||
return None
|
||||
if show.returncode != 0:
|
||||
return None
|
||||
return show.stdout
|
||||
|
||||
|
||||
def check_deploy_status(repo: str, work_item_id: str, branch: str | None = None) -> tuple[bool, str]:
|
||||
"""
|
||||
БАГ 8 fix: gate the deploy -> done transition on the deployer's machine-readable
|
||||
@@ -291,32 +414,30 @@ def check_deploy_status(repo: str, work_item_id: str, branch: str | None = None)
|
||||
frontmatter. Returns:
|
||||
(True, ...) -> deploy_status: SUCCESS
|
||||
(False, ...) -> deploy_status: FAILED, missing field, or no frontmatter
|
||||
|
||||
ET-013 path-sync fix: the deployer writes 14-deploy-log.md and merges the deploy
|
||||
artifacts into main via a SEPARATE PR, so the log lands in origin/main, not in
|
||||
the feature-branch worktree this gate reads via _repo_path(repo, branch). If the
|
||||
file is absent in the worktree we fall back to reading it from origin/main on the
|
||||
shared clone. Lookup order: worktree -> origin/main -> not found.
|
||||
"""
|
||||
import yaml
|
||||
repo_path = _repo_path(repo, branch)
|
||||
log_path = os.path.join(repo_path, f"docs/work-items/{work_item_id}/14-deploy-log.md")
|
||||
|
||||
if not os.path.isfile(log_path):
|
||||
return False, "Deploy log not found (14-deploy-log.md)"
|
||||
try:
|
||||
with open(log_path, "r") as f:
|
||||
content = f.read()
|
||||
status = None
|
||||
if content.startswith("---"):
|
||||
parts = content.split("---", 2)
|
||||
if len(parts) >= 3:
|
||||
try:
|
||||
fm = yaml.safe_load(parts[1]) or {}
|
||||
except yaml.YAMLError as e:
|
||||
return False, f"Invalid YAML frontmatter in deploy log: {e}"
|
||||
status = str(fm.get("deploy_status", "")).upper().strip()
|
||||
if status == "SUCCESS":
|
||||
return True, "Deploy status: SUCCESS"
|
||||
if status == "FAILED":
|
||||
return False, "Deploy status: FAILED"
|
||||
return False, f"No machine-readable deploy_status in frontmatter (got: {status!r})"
|
||||
except OSError as e:
|
||||
return False, f"Error reading deploy log: {e}"
|
||||
if os.path.isfile(log_path):
|
||||
try:
|
||||
with open(log_path, "r") as f:
|
||||
content = f.read()
|
||||
except OSError as e:
|
||||
return False, f"Error reading deploy log: {e}"
|
||||
return _parse_deploy_status(content)
|
||||
|
||||
# Not in the feature worktree — the deployer may have merged it into main.
|
||||
main_content = _deploy_log_from_main(repo, work_item_id)
|
||||
if main_content is not None:
|
||||
return _parse_deploy_status(main_content)
|
||||
|
||||
return False, "Deploy log not found (14-deploy-log.md)"
|
||||
|
||||
|
||||
# Registry for dynamic lookup by name
|
||||
|
||||
@@ -38,3 +38,36 @@ def _no_telegram(monkeypatch):
|
||||
monkeypatch.setattr("src.agents.launcher.send_telegram", _noop, raising=False)
|
||||
monkeypatch.setattr("src.queue_worker.send_telegram", _noop, raising=False)
|
||||
yield
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def _reset_webhook_secrets(monkeypatch):
|
||||
"""Isolate settings singleton between test files (CI cross-file isolation).
|
||||
|
||||
settings is a process-wide Pydantic singleton read once at import. Different
|
||||
test modules set env variables differently at import-time, so those values leak
|
||||
across files when pytest collects them together (as CI does).
|
||||
|
||||
1. webhook secrets: reset to "" so HMAC is disabled by default. Tests that
|
||||
intentionally test the 401 path (test_webhook_dedup.py:268,278) re-apply
|
||||
their own monkeypatch AFTER this autouse fixture runs, which overrides the
|
||||
reset for the duration of that one test only.
|
||||
|
||||
2. db_path: reset to the value from ORCH_DB_PATH env var (last written by the
|
||||
last imported test module). Without this, test_webhook_dedup.py (imported
|
||||
first, alphabetically) seeds settings.db_path = dedup.db, while
|
||||
test_webhooks.py's setup_db fixture tries to remove test_orchestrator.db,
|
||||
leaving the DB dirty across tests that share a branch name and causing
|
||||
get_task_by_repo_branch() to return a stale row with the wrong stage.
|
||||
Per-test monkeypatches in test_webhook_dedup.setup_db override this reset.
|
||||
"""
|
||||
import os
|
||||
from src.webhooks import gitea as gitea_mod
|
||||
from src.webhooks import plane as plane_mod
|
||||
from src import db as db_mod
|
||||
monkeypatch.setattr(gitea_mod.settings, "gitea_webhook_secret", "", raising=False)
|
||||
monkeypatch.setattr(plane_mod.settings, "plane_webhook_secret", "", raising=False)
|
||||
db_path_env = os.environ.get("ORCH_DB_PATH", "")
|
||||
if db_path_env:
|
||||
monkeypatch.setattr(db_mod.settings, "db_path", db_path_env, raising=False)
|
||||
yield
|
||||
|
||||
166
tests/test_qg.py
166
tests/test_qg.py
@@ -167,23 +167,110 @@ class TestCheckReviewApproved:
|
||||
|
||||
|
||||
class TestCheckTestsPassed:
|
||||
def test_report_with_pass(self, setup_work_item_dir):
|
||||
repo_dir = setup_work_item_dir
|
||||
wi_dir = repo_dir / "docs" / "work-items" / "ET-001"
|
||||
wi_dir.mkdir(parents=True)
|
||||
(wi_dir / "13-test-report.md").write_text("# Test Report\n\nResult: PASS\n")
|
||||
"""ET-013 fix: testing -> deploy gate reads the tester's MACHINE-READABLE verdict
|
||||
in 13-test-report.md frontmatter (verdict:/status:), NOT a substring of the body.
|
||||
Mirrors check_reviewer_verdict / check_deploy_status. The old `if "PASS" in content`
|
||||
let a `verdict: BLOCKED` report whose prose said "23 passed"/"✅ PASS" pass the gate,
|
||||
shipping an unfinished feature to Done."""
|
||||
|
||||
def _write(self, repo_dir, content, wi="ET-001"):
|
||||
wi_dir = repo_dir / "docs" / "work-items" / wi
|
||||
wi_dir.mkdir(parents=True)
|
||||
(wi_dir / "13-test-report.md").write_text(content)
|
||||
|
||||
def test_verdict_pass_passes(self, setup_work_item_dir):
|
||||
# Most common real form (ET-001/002/005/009/011/012/014).
|
||||
self._write(
|
||||
setup_work_item_dir,
|
||||
"---\ntype: test-report\nverdict: PASS\nstatus: pass\n---\n\n# Test Report\n",
|
||||
)
|
||||
passed, reason = check_tests_passed("enduro-trails", "ET-001")
|
||||
assert passed is True
|
||||
assert "PASS" in reason
|
||||
|
||||
def test_verdict_pass_ready_to_deploy_passes(self, setup_work_item_dir):
|
||||
# ET-007 real form: "PASS — ready-to-deploy".
|
||||
self._write(
|
||||
setup_work_item_dir,
|
||||
"---\nverdict: PASS — ready-to-deploy\nstatus: PASS\n---\n\nbody\n",
|
||||
)
|
||||
passed, reason = check_tests_passed("enduro-trails", "ET-001")
|
||||
assert passed is True
|
||||
|
||||
def test_report_without_pass(self, setup_work_item_dir):
|
||||
repo_dir = setup_work_item_dir
|
||||
wi_dir = repo_dir / "docs" / "work-items" / "ET-001"
|
||||
wi_dir.mkdir(parents=True)
|
||||
(wi_dir / "13-test-report.md").write_text("# Test Report\n\nResult: FAIL\n")
|
||||
def test_verdict_ready_to_deploy_with_status_passed_passes(self, setup_work_item_dir):
|
||||
# ET-006 real form: verdict has no PASS word, but status: PASSED.
|
||||
self._write(
|
||||
setup_work_item_dir,
|
||||
"---\nverdict: ready-to-deploy\nstatus: PASSED\n---\n\nbody\n",
|
||||
)
|
||||
passed, reason = check_tests_passed("enduro-trails", "ET-001")
|
||||
assert passed is True
|
||||
|
||||
def test_verdict_stage_ready_to_deploy_with_status_pass_passes(self, setup_work_item_dir):
|
||||
# ET-008 real form: verdict: stage:ready-to-deploy, status: pass.
|
||||
self._write(
|
||||
setup_work_item_dir,
|
||||
"---\nverdict: stage:ready-to-deploy\nstatus: pass\n---\n\nbody\n",
|
||||
)
|
||||
passed, reason = check_tests_passed("enduro-trails", "ET-001")
|
||||
assert passed is True
|
||||
|
||||
def test_blocked_verdict_with_pass_in_body_fails(self, setup_work_item_dir):
|
||||
# THE ET-013 BUG: verdict BLOCKED but body is full of "PASS"/"passed".
|
||||
self._write(
|
||||
setup_work_item_dir,
|
||||
"---\ntype: test-report\nstatus: blocked\nverdict: BLOCKED\n---\n\n"
|
||||
"23 passed\n✅ PASS (часть AC-18)\nAll checks passed\n",
|
||||
)
|
||||
passed, reason = check_tests_passed("enduro-trails", "ET-001")
|
||||
assert passed is False
|
||||
assert "BLOCKED" in reason
|
||||
|
||||
def test_failed_verdict_fails(self, setup_work_item_dir):
|
||||
self._write(
|
||||
setup_work_item_dir,
|
||||
"---\nverdict: FAILED\nstatus: failed\n---\n\nbody\n",
|
||||
)
|
||||
passed, reason = check_tests_passed("enduro-trails", "ET-001")
|
||||
assert passed is False
|
||||
assert "FAILED" in reason
|
||||
|
||||
def test_passed_count_in_body_but_blocked_verdict_fails(self, setup_work_item_dir):
|
||||
# Body says "23 passed" but frontmatter verdict BLOCKED -> substring no longer fools.
|
||||
self._write(
|
||||
setup_work_item_dir,
|
||||
"---\nverdict: BLOCKED\n---\n\nTests: 23 passed, 0 failed.\n",
|
||||
)
|
||||
passed, reason = check_tests_passed("enduro-trails", "ET-001")
|
||||
assert passed is False
|
||||
|
||||
def test_no_frontmatter_fails(self, setup_work_item_dir):
|
||||
# Old format / prose only -> no machine verdict -> fail.
|
||||
self._write(
|
||||
setup_work_item_dir,
|
||||
"# Test Report\n\nResult: PASS\nAll tests passed.\n",
|
||||
)
|
||||
passed, reason = check_tests_passed("enduro-trails", "ET-001")
|
||||
assert passed is False
|
||||
|
||||
def test_no_verdict_field_fails(self, setup_work_item_dir):
|
||||
# Frontmatter present but neither verdict nor status -> fail.
|
||||
self._write(
|
||||
setup_work_item_dir,
|
||||
"---\ntype: test-report\nversion: 1\n---\n\nResult: PASS\n",
|
||||
)
|
||||
passed, reason = check_tests_passed("enduro-trails", "ET-001")
|
||||
assert passed is False
|
||||
|
||||
def test_invalid_yaml_fails_no_exception(self, setup_work_item_dir):
|
||||
# Broken YAML frontmatter -> False with reason, never raises.
|
||||
self._write(
|
||||
setup_work_item_dir,
|
||||
"---\nverdict: [unclosed\n : : :\n---\n\nbody PASS\n",
|
||||
)
|
||||
passed, reason = check_tests_passed("enduro-trails", "ET-001")
|
||||
assert passed is False
|
||||
assert "YAML" in reason or "frontmatter" in reason.lower()
|
||||
|
||||
def test_no_report(self, setup_work_item_dir):
|
||||
passed, reason = check_tests_passed("enduro-trails", "ET-001")
|
||||
@@ -242,6 +329,65 @@ class TestCheckDeployStatus:
|
||||
passed, reason = check_deploy_status("enduro-trails", "ET-011")
|
||||
assert passed is False
|
||||
|
||||
# --- ET-013 path-sync fix: log written to origin/main via separate PR ---
|
||||
|
||||
def test_origin_main_success_passes_when_absent_in_worktree(self, monkeypatch):
|
||||
# Deployer merged 14-deploy-log.md into main via a separate PR; it is NOT
|
||||
# in the feature worktree. Gate must recover it from origin/main -> PASS.
|
||||
# (This is the exact ET-013 regression.)
|
||||
monkeypatch.setattr(
|
||||
"src.qg.checks._deploy_log_from_main",
|
||||
lambda repo, wi: "---\ndeploy_status: SUCCESS\nversion: v0.0.5\n---\n\nLive.\n",
|
||||
)
|
||||
passed, reason = check_deploy_status("enduro-trails", "ET-013")
|
||||
assert passed is True
|
||||
assert "SUCCESS" in reason
|
||||
|
||||
def test_origin_main_failed_fails(self, monkeypatch):
|
||||
# A genuine FAILED log in main must still fail.
|
||||
monkeypatch.setattr(
|
||||
"src.qg.checks._deploy_log_from_main",
|
||||
lambda repo, wi: "---\ndeploy_status: FAILED\nversion: v0.0.5\n---\n\nboom.\n",
|
||||
)
|
||||
passed, reason = check_deploy_status("enduro-trails", "ET-013")
|
||||
assert passed is False
|
||||
assert "FAILED" in reason
|
||||
|
||||
def test_absent_everywhere_fails(self, monkeypatch):
|
||||
# Not in worktree and origin/main lookup yields nothing -> not found.
|
||||
monkeypatch.setattr(
|
||||
"src.qg.checks._deploy_log_from_main", lambda repo, wi: None
|
||||
)
|
||||
passed, reason = check_deploy_status("enduro-trails", "ET-013")
|
||||
assert passed is False
|
||||
assert "not found" in reason.lower()
|
||||
|
||||
@patch("src.qg.checks.subprocess.run")
|
||||
@patch("src.qg.checks.os.path.isdir", return_value=True)
|
||||
def test_fetch_failure_degrades_no_exception(self, mock_isdir, mock_run):
|
||||
# git fetch/show raising (e.g. network) must degrade to "not found",
|
||||
# never propagate an exception out of the gate.
|
||||
import subprocess as _sp
|
||||
mock_run.side_effect = _sp.TimeoutExpired(cmd="git", timeout=30)
|
||||
passed, reason = check_deploy_status("enduro-trails", "ET-013")
|
||||
assert passed is False
|
||||
assert "not found" in reason.lower()
|
||||
|
||||
def test_worktree_log_short_circuits_main_lookup(self, setup_work_item_dir, monkeypatch):
|
||||
# If the log IS present in the worktree, origin/main must NOT be consulted.
|
||||
self._write_log(
|
||||
setup_work_item_dir,
|
||||
"---\ndeploy_status: SUCCESS\nversion: v0.0.3\n---\n\nDeployed OK.\n",
|
||||
)
|
||||
called = {"n": 0}
|
||||
def _boom(repo, wi):
|
||||
called["n"] += 1
|
||||
return None
|
||||
monkeypatch.setattr("src.qg.checks._deploy_log_from_main", _boom)
|
||||
passed, reason = check_deploy_status("enduro-trails", "ET-011")
|
||||
assert passed is True
|
||||
assert called["n"] == 0
|
||||
|
||||
def test_deploy_stage_qg_is_check_deploy_status(self):
|
||||
assert get_qg_for_stage("deploy") == "check_deploy_status"
|
||||
|
||||
|
||||
@@ -54,13 +54,19 @@ def test_status_endpoint():
|
||||
assert "active_tasks" in resp.json()
|
||||
|
||||
|
||||
@patch("src.plane_sync.add_comment")
|
||||
@patch("src.plane_sync.fetch_issue_sequence_id", return_value=None)
|
||||
@patch("src.plane_sync.fetch_issue_fields", return_value=("Test task", "This is a detailed test description for the task"))
|
||||
@patch("src.webhooks.plane._create_gitea_branch", new_callable=AsyncMock)
|
||||
@patch("src.webhooks.plane._create_initial_docs", new_callable=AsyncMock)
|
||||
def test_plane_webhook_creates_task(mock_docs, mock_branch):
|
||||
"""work_item.created → task in DB with stage=analysis."""
|
||||
def test_plane_webhook_creates_task(mock_docs, mock_branch, mock_fetch_fields, mock_fetch_seq, mock_add_comment):
|
||||
"""work_item.created (via In Progress status) → task in DB with stage=analysis."""
|
||||
resp = client.post("/webhook/plane", json={
|
||||
"event": "work_item.created",
|
||||
"data": {"id": "test-123", "name": "Test task", "project": "proj-1"}
|
||||
"event": "issue", "action": "updated",
|
||||
"data": {
|
||||
"id": "test-123", "name": "Test task", "project": "proj-1",
|
||||
"state": {"id": "b873d9eb-993c-48cd-97ac-99a9b1623967", "name": "In Progress", "group": "started"},
|
||||
}
|
||||
})
|
||||
assert resp.status_code == 200
|
||||
assert resp.json()["status"] == "accepted"
|
||||
@@ -75,17 +81,37 @@ def test_plane_webhook_creates_task(mock_docs, mock_branch):
|
||||
assert "feature/" in task["branch"]
|
||||
|
||||
|
||||
@patch("src.plane_sync.add_comment")
|
||||
@patch("src.plane_sync.fetch_issue_sequence_id", return_value=None)
|
||||
@patch("src.plane_sync.fetch_issue_fields",
|
||||
side_effect=[
|
||||
("First task", "This is a detailed description for the first task item"),
|
||||
("Second task", "This is a detailed description for the second task item"),
|
||||
])
|
||||
@patch("src.webhooks.plane._create_gitea_branch", new_callable=AsyncMock)
|
||||
@patch("src.webhooks.plane._create_initial_docs", new_callable=AsyncMock)
|
||||
def test_plane_webhook_generates_sequential_ids(mock_docs, mock_branch):
|
||||
"""Multiple work items get sequential IDs."""
|
||||
def test_plane_webhook_generates_sequential_ids(
|
||||
mock_docs, mock_branch, mock_fetch_fields, mock_fetch_seq, mock_add_comment
|
||||
):
|
||||
"""Multiple In Progress transitions get sequential IDs (ET-001, ET-002)."""
|
||||
in_progress_state = {
|
||||
"id": "b873d9eb-993c-48cd-97ac-99a9b1623967",
|
||||
"name": "In Progress",
|
||||
"group": "started",
|
||||
}
|
||||
client.post("/webhook/plane", json={
|
||||
"event": "work_item.created",
|
||||
"data": {"id": "item-1", "name": "First task", "project": "proj-1"}
|
||||
"event": "issue", "action": "updated",
|
||||
"data": {
|
||||
"id": "item-1", "name": "First task", "project": "proj-1",
|
||||
"state": in_progress_state,
|
||||
}
|
||||
})
|
||||
client.post("/webhook/plane", json={
|
||||
"event": "work_item.created",
|
||||
"data": {"id": "item-2", "name": "Second task", "project": "proj-1"}
|
||||
"event": "issue", "action": "updated",
|
||||
"data": {
|
||||
"id": "item-2", "name": "Second task", "project": "proj-1",
|
||||
"state": in_progress_state,
|
||||
}
|
||||
})
|
||||
|
||||
conn = get_db()
|
||||
@@ -202,8 +228,9 @@ def test_gitea_webhook_push():
|
||||
assert resp.json()["status"] == "accepted"
|
||||
|
||||
|
||||
@patch("src.webhooks.gitea.plane_notify_stage")
|
||||
@patch("src.webhooks.gitea.launcher")
|
||||
def test_gitea_push_with_adr_advances_stage(mock_launcher):
|
||||
def test_gitea_push_with_adr_advances_stage(mock_launcher, mock_plane_notify):
|
||||
"""Push with ADR files at architecture stage → advance to development."""
|
||||
mock_launcher.launch.return_value = 1
|
||||
|
||||
@@ -235,7 +262,7 @@ def test_gitea_push_with_adr_advances_stage(mock_launcher):
|
||||
task = conn.execute("SELECT * FROM tasks WHERE plane_id = 'push-001'").fetchone()
|
||||
conn.close()
|
||||
assert task["stage"] == "development"
|
||||
mock_launcher.launch.assert_called_once()
|
||||
mock_plane_notify.assert_called_once()
|
||||
|
||||
|
||||
@patch("src.webhooks.gitea.check_ci_green")
|
||||
|
||||
Reference in New Issue
Block a user