Public Access
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 emil
|
ca41f3025c | ||
|
emilandDevin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
|
84fc223327 |
@@ -77,9 +77,6 @@ jobs:
|
||||
CI_GITEA_API_TOKEN: ${{ secrets.CI_GITEA_API_TOKEN }}
|
||||
CI_GITEA_USERNAME: ${{ vars.CI_GITEA_USERNAME }}
|
||||
PYTHONPATH: src
|
||||
# Serialize blob uploads to avoid Gitea registry race condition
|
||||
# (BlobUploader.Append offset mismatch — see DEVX-162).
|
||||
DOCKER_MAX_CONCURRENT_UPLOADS: "1"
|
||||
run: |
|
||||
. .venv/bin/activate
|
||||
export PATH="$HOME/.local/bin:$PATH"
|
||||
|
||||
+7
-20
@@ -181,31 +181,18 @@ jobs:
|
||||
- name: Post approval review
|
||||
env:
|
||||
REVIEWER_GITEA_API_TOKEN: ${{ secrets.REVIEWER_GITEA_API_TOKEN }}
|
||||
CI_GITEA_API_TOKEN: ${{ secrets.CI_GITEA_API_TOKEN }}
|
||||
PR_NUMBER: ${{ github.event.number }}
|
||||
GITHUB_SERVER_URL: ${{ github.server_url }}
|
||||
GITHUB_REPOSITORY: ${{ github.repository }}
|
||||
run: |
|
||||
. .venv/bin/activate 2>/dev/null || true
|
||||
# Post APPROVE review via Gitea API to satisfy branch protection.
|
||||
# Try REVIEWER_GITEA_API_TOKEN first; fall back to CI_GITEA_API_TOKEN
|
||||
# (CI bot account) if the reviewer token is the same user as the PR
|
||||
# creator (Gitea rejects self-approvals).
|
||||
for TOKEN in "${REVIEWER_GITEA_API_TOKEN}" "${CI_GITEA_API_TOKEN}"; do
|
||||
[ -z "$TOKEN" ] && continue
|
||||
RESPONSE=$(curl -s -w "\n%{http_code}" -X POST \
|
||||
"${GITHUB_SERVER_URL}/api/v1/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews" \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"event":"APPROVED","body":"Auto-approved: all CI checks passed (validate job)."}')
|
||||
HTTP_CODE=$(echo "$RESPONSE" | tail -1)
|
||||
BODY=$(echo "$RESPONSE" | head -n -1)
|
||||
if [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "201" ]; then
|
||||
echo "Approval posted successfully (HTTP $HTTP_CODE)."
|
||||
break
|
||||
fi
|
||||
echo "::warning::Approval with token failed (HTTP $HTTP_CODE): ${BODY}"
|
||||
done
|
||||
# Post APPROVE review via Gitea API to satisfy branch protection
|
||||
curl -s -X POST \
|
||||
"${GITHUB_SERVER_URL}/api/v1/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews" \
|
||||
-H "Authorization: token ${REVIEWER_GITEA_API_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d '{"event":"APPROVED","body":"Auto-approved: all CI checks passed (validate job)."}' \
|
||||
|| echo "::warning::Failed to post approval review (best-effort)."
|
||||
- name: Squash merge with task ID
|
||||
env:
|
||||
CI_GITEA_API_TOKEN: ${{ secrets.CI_GITEA_API_TOKEN }}
|
||||
|
||||
@@ -2,52 +2,6 @@
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
## [0.51.7] - 2026-08-26
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- Increase HTTP 500 retry count to 5 with longer backoff and visible logging
|
||||
|
||||
## [0.51.6] - 2026-08-26
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- Use stderr=STDOUT to capture all docker push output in one stream
|
||||
|
||||
## [0.51.5] - 2026-08-26
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- Check stdout for HTTP 500 in _run_push (docker sends to stdout)
|
||||
|
||||
## [0.51.4] - 2026-08-26
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- Serialize registry uploads and retry on HTTP 500
|
||||
|
||||
### Refactor
|
||||
|
||||
- Remove cross-repo contract tests from devx
|
||||
|
||||
## [0.51.3] - 2026-08-26
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- Fall back to CI bot token for auto-merge approval
|
||||
|
||||
## [0.51.2] - 2026-08-26
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- Push-first strategy in build_image to avoid losing latest tag
|
||||
|
||||
## [0.51.1] - 2026-08-25
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- Delete existing manifest before push (Gitea #31964 workaround)
|
||||
|
||||
## [0.51.0] - 2026-08-25
|
||||
|
||||
### Features
|
||||
|
||||
@@ -16,12 +16,12 @@ quality badges.
|
||||
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/src/branch/master/LICENSE)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/wiki)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/releases)
|
||||
[](https://www.python.org/downloads/)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/wiki)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/releases)
|
||||
[](https://www.python.org/downloads/)
|
||||
|
||||
## Why devx?
|
||||
|
||||
@@ -87,7 +87,7 @@ extra index and list devx in your dependencies:
|
||||
```toml
|
||||
[project]
|
||||
dependencies = [
|
||||
"devx>=0.51.7",
|
||||
"devx>=0.51.0",
|
||||
]
|
||||
|
||||
[tool.pip]
|
||||
@@ -101,8 +101,8 @@ pip install -e .
|
||||
```
|
||||
|
||||
> **Note:** If your project requires a specific devx version, pin it in
|
||||
> `dependencies` (for example, `"devx==0.51.7"`) or use a version constraint
|
||||
> (for example, `"devx>=0.51.7,<0.52"`).
|
||||
> `dependencies` (for example, `"devx==0.51.0"`) or use a version constraint
|
||||
> (for example, `"devx>=0.51.0,<0.52"`).
|
||||
|
||||
### Optional extras
|
||||
|
||||
|
||||
+8
-8
@@ -12,12 +12,12 @@ project to be reusable across all oblachno-oss repositories.
|
||||
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/src/branch/master/LICENSE)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/wiki)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/releases)
|
||||
[](https://www.python.org/downloads/)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/wiki)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/actions)
|
||||
[](https://git.oblachno.oblachno.fyi/oblachno-oss/devx/releases)
|
||||
[](https://www.python.org/downloads/)
|
||||
|
||||
## Overview
|
||||
|
||||
@@ -74,14 +74,14 @@ Add devx to your `pyproject.toml` dependencies and configure the registry:
|
||||
```toml
|
||||
[project]
|
||||
dependencies = [
|
||||
"devx>=0.51.7",
|
||||
"devx>=0.51.0",
|
||||
]
|
||||
|
||||
[tool.pip]
|
||||
extra-index-url = "https://git.oblachno.oblachno.fyi/api/packages/oblachno-oss/pypi/simple"
|
||||
```
|
||||
|
||||
Pin a specific version if needed: `"devx==0.51.7"` or `"devx>=0.51.7,<0.52"`.
|
||||
Pin a specific version if needed: `"devx==0.51.0"` or `"devx>=0.51.0,<0.52"`.
|
||||
|
||||
### Optional extras
|
||||
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
# DEVX-159: Fix build_image push-first strategy to avoid losing latest tag
|
||||
|
||||
## Problem
|
||||
The `push_image` function in `build_image.py` deletes the existing
|
||||
manifest *before* pushing (Gitea #31964 workaround). When the push
|
||||
fails for other reasons (HTTP 500), the old tag is lost, breaking all
|
||||
CI jobs that use that image.
|
||||
|
||||
This caused `ci-base:latest` to disappear from the registry when
|
||||
build-images run #4104 failed with HTTP 500 on push, after already
|
||||
deleting the old `latest` manifest.
|
||||
|
||||
## Approach
|
||||
Switch to a push-first strategy:
|
||||
1. Try pushing directly
|
||||
2. Only if push fails with "already exists" (Gitea #31964), delete
|
||||
the old manifest and retry
|
||||
3. If push fails for any other reason, the old manifest is preserved
|
||||
|
||||
REQ-1: Push first, no pre-emptive delete
|
||||
REQ-2: Delete + retry only on "already exists" error
|
||||
REQ-3: Old manifest preserved on non-already-exists failures
|
||||
REQ-4: 100% test coverage of new logic
|
||||
|
||||
## Test Plan
|
||||
- Unit tests for all push paths (success, already-exists retry,
|
||||
non-already-exists failure, retry-also-fails)
|
||||
- Verify existing tests still pass
|
||||
|
||||
## Deploy Plan
|
||||
- Merge to master, build-images workflow uses new push logic on next
|
||||
image rebuild
|
||||
|
||||
## Rollback Plan
|
||||
- Revert the merge commit
|
||||
|
||||
## Acceptance Criteria
|
||||
- [x] REQ-1: Push first, no pre-emptive delete
|
||||
- [x] REQ-2: Delete + retry only on "already exists" error
|
||||
- [x] REQ-3: Old manifest preserved on non-already-exists failures
|
||||
- [x] REQ-4: 100% test coverage of new logic
|
||||
@@ -1,31 +0,0 @@
|
||||
# DEVX-160: Remove cross-repo contract tests from devx
|
||||
|
||||
## Problem
|
||||
devx unit tests (`test_spec_driven_workflows.py`) were validating workflow
|
||||
YAML and skill files in infra, grm, sso-bridge, and Mattermost OIDC repos.
|
||||
This is an architecture violation — devx must not be aware of other repos.
|
||||
Those repos consume devx; devx does not test them.
|
||||
|
||||
## Approach
|
||||
Rewrite `test_spec_driven_workflows.py` to only test devx's own workflows
|
||||
and skills. Remove all references to `_OBLACHNO_ROOT`, `_INFRA`, `_GRM`,
|
||||
`_SSO_BRIDGE`, and parametrized repo lists.
|
||||
|
||||
REQ-1: No references to other repos in devx tests
|
||||
REQ-2: All devx workflow/skill tests still pass
|
||||
REQ-3: 100% coverage maintained
|
||||
|
||||
## Test Plan
|
||||
- Run `pytest tests/unit/test_spec_driven_workflows.py` — all pass
|
||||
- Run full test suite with coverage — 100%
|
||||
|
||||
## Deploy Plan
|
||||
- Merge to master
|
||||
|
||||
## Rollback Plan
|
||||
- Revert the merge commit
|
||||
|
||||
## Acceptance Criteria
|
||||
- [x] REQ-1: No references to other repos in devx tests
|
||||
- [x] REQ-2: All devx workflow/skill tests still pass
|
||||
- [x] REQ-3: 100% coverage maintained
|
||||
@@ -1,27 +0,0 @@
|
||||
# DEVX-161: Fix auto-merge self-approval: use CI bot token fallback
|
||||
|
||||
## Problem
|
||||
The auto-merge workflow posts an APPROVE review using
|
||||
`REVIEWER_GITEA_API_TOKEN`. When this token belongs to the same user
|
||||
who created the PR, Gitea rejects the self-approval, causing the merge
|
||||
to fail with HTTP 405 "Does not have enough approvals."
|
||||
|
||||
## Approach
|
||||
Try `REVIEWER_GITEA_API_TOKEN` first; if it fails (self-approval
|
||||
rejection), fall back to `CI_GITEA_API_TOKEN` (kireto — CI bot account).
|
||||
|
||||
REQ-1: Auto-merge posts approval with fallback to CI bot token
|
||||
REQ-2: Approval step reports which token succeeded
|
||||
|
||||
## Test Plan
|
||||
- Create a PR and observe auto-merge succeeds
|
||||
|
||||
## Deploy Plan
|
||||
- Merge to master
|
||||
|
||||
## Rollback Plan
|
||||
- Revert the merge commit
|
||||
|
||||
## Acceptance Criteria
|
||||
- [x] REQ-1: Auto-merge posts approval with fallback to CI bot token
|
||||
- [x] REQ-2: Approval step reports which token succeeded
|
||||
@@ -1,41 +0,0 @@
|
||||
# DEVX-162: Fix registry push race condition: serialize uploads + retry on HTTP 500
|
||||
|
||||
## Problem
|
||||
The Gitea container registry (v1.27.2) has a known race condition in
|
||||
`BlobUploader.Append()` where concurrent blob uploads cause the file
|
||||
offset and DB model to get out of sync, producing HTTP 500 "offset
|
||||
mismatch between file and model" errors. This causes the build-images
|
||||
workflow to fail intermittently when pushing runner images.
|
||||
|
||||
The `package_blob_upload` table accumulates stale entries from failed
|
||||
uploads that worsen the problem over time.
|
||||
|
||||
## Approach
|
||||
Two fixes in devx (a third fix — scheduled cleanup — is tracked
|
||||
separately as OBL-INFRA-537):
|
||||
|
||||
1. Set `DOCKER_MAX_CONCURRENT_UPLOADS=1` in the build-images workflow
|
||||
to serialize blob uploads and avoid the race condition.
|
||||
|
||||
2. Add HTTP 500 retry logic to `push_image` in `build_image.py`.
|
||||
When a push fails with HTTP 500 (not "already exists"), retry up
|
||||
to 3 times with exponential backoff (5s, 10s, 20s).
|
||||
|
||||
REQ-1: Build-images workflow sets DOCKER_MAX_CONCURRENT_UPLOADS=1
|
||||
REQ-2: push_image retries on HTTP 500 with exponential backoff
|
||||
REQ-3: All existing tests pass with 100% coverage
|
||||
|
||||
## Test Plan
|
||||
- Unit tests for retry logic (mock subprocess)
|
||||
- Manual: trigger build-images workflow and verify push succeeds
|
||||
|
||||
## Deploy Plan
|
||||
- Merge to master
|
||||
|
||||
## Rollback Plan
|
||||
- Revert the merge commit
|
||||
|
||||
## Acceptance Criteria
|
||||
- [x] REQ-1: Build-images workflow sets DOCKER_MAX_CONCURRENT_UPLOADS=1
|
||||
- [x] REQ-2: push_image retries on HTTP 500 with exponential backoff
|
||||
- [x] REQ-3: All existing tests pass with 100% coverage
|
||||
@@ -1,33 +0,0 @@
|
||||
# DEVX-163: Fix _run_push to check stdout for HTTP 500
|
||||
|
||||
## Problem
|
||||
`_run_push` only checked `result.stderr` for HTTP 500, but docker push
|
||||
sends the "received unexpected HTTP status: 500 Internal Server Error"
|
||||
message to **stdout**, not stderr. This means the tenacity retry logic
|
||||
added in DEVX-162 never triggered — the push failed immediately without
|
||||
retrying.
|
||||
|
||||
## Approach
|
||||
Check both `result.stdout` and `result.stderr` for the "500" status code.
|
||||
Also update the "already exists" check in `push_image` to check both
|
||||
streams, since docker may send that message to stdout as well.
|
||||
|
||||
REQ-1: _run_push checks both stdout and stderr for HTTP 500
|
||||
REQ-2: push_image "already exists" check uses combined stdout+stderr
|
||||
REQ-3: All existing tests pass with 100% coverage
|
||||
|
||||
## Test Plan
|
||||
- Unit tests for stdout 500 detection
|
||||
- Unit tests for stderr 500 detection
|
||||
- Manual: trigger build-images workflow and verify retry works
|
||||
|
||||
## Deploy Plan
|
||||
- Merge to master
|
||||
|
||||
## Rollback Plan
|
||||
- Revert the merge commit
|
||||
|
||||
## Acceptance Criteria
|
||||
- [x] REQ-1: _run_push checks both stdout and stderr for HTTP 500
|
||||
- [x] REQ-2: push_image "already exists" check uses combined stdout+stderr
|
||||
- [x] REQ-3: All existing tests pass with 100% coverage
|
||||
@@ -1,34 +0,0 @@
|
||||
# DEVX-164: Increase HTTP 500 retry count and backoff for docker push
|
||||
|
||||
## Problem
|
||||
The HTTP 500 retry logic (DEVX-162, DEVX-163) works correctly — 3 retry
|
||||
attempts are made. But all 3 attempts fail because the Gitea registry's
|
||||
"offset mismatch" race condition needs more than ~15s to recover. The
|
||||
current backoff is 5s-20s with 3 attempts (total ~15s of waiting).
|
||||
|
||||
## Approach
|
||||
Increase retry count from 3 to 5 and backoff from 5-20s to 10-60s,
|
||||
giving the registry up to ~2 minutes to recover. Add visible logging
|
||||
between retry attempts so the CI logs show the retry happening.
|
||||
|
||||
REQ-1: Increase retry count from 3 to 5
|
||||
REQ-2: Increase backoff from 5-20s to 10-60s exponential
|
||||
REQ-3: Add visible logging between retry attempts (click.echo)
|
||||
REQ-4: All tests pass with 100% coverage
|
||||
|
||||
## Test Plan
|
||||
- Unit tests verify retry count and backoff parameters
|
||||
- Unit tests verify logging output on retry
|
||||
- Manual: trigger build-images workflow and verify retries visible in logs
|
||||
|
||||
## Deploy Plan
|
||||
- Merge to master
|
||||
|
||||
## Rollback Plan
|
||||
- Revert the merge commit
|
||||
|
||||
## Acceptance Criteria
|
||||
- [x] REQ-1: Increase retry count from 3 to 5
|
||||
- [x] REQ-2: Increase backoff from 5-20s to 10-60s exponential
|
||||
- [x] REQ-3: Add visible logging between retry attempts (click.echo)
|
||||
- [x] REQ-4: All tests pass with 100% coverage
|
||||
@@ -48,12 +48,12 @@ Add devx to your `pyproject.toml`:
|
||||
```toml
|
||||
[project]
|
||||
dependencies = [
|
||||
"devx>=0.51.7",
|
||||
"devx>=0.51.0",
|
||||
]
|
||||
|
||||
[project.optional-dependencies]
|
||||
dev = [
|
||||
"devx>=0.51.7",
|
||||
"devx>=0.51.0",
|
||||
]
|
||||
```
|
||||
|
||||
|
||||
@@ -6,4 +6,4 @@ create_dependency_pr, auto_merge, release, publish), developer tooling
|
||||
molecule testing helpers for Ansible projects.
|
||||
"""
|
||||
|
||||
__version__ = "0.51.7"
|
||||
__version__ = "0.51.0"
|
||||
|
||||
@@ -50,7 +50,6 @@ from dataclasses import dataclass, field
|
||||
from pathlib import Path
|
||||
|
||||
import click
|
||||
from tenacity import retry, retry_if_exception_type, stop_after_attempt, wait_exponential
|
||||
|
||||
from devx.i18n import _
|
||||
from devx.tokens import get_developer_token
|
||||
@@ -255,36 +254,6 @@ def delete_remote_manifest(
|
||||
return True
|
||||
|
||||
|
||||
class PushHTTP500Error(Exception):
|
||||
"""Raised when docker push fails with an HTTP 500 from the registry."""
|
||||
|
||||
|
||||
def _run_push(cmd: list[str]) -> subprocess.CompletedProcess[str]:
|
||||
"""Run a docker push command, raising PushHTTP500Error on registry 500.
|
||||
|
||||
The Gitea container registry (v1.27.x) has a race condition in
|
||||
BlobUploader.Append that causes intermittent HTTP 500 "offset
|
||||
mismatch" errors during concurrent blob uploads. Retrying the
|
||||
push gives the registry time to recover.
|
||||
|
||||
Docker sends push progress/errors to both stdout and stderr depending
|
||||
on the error type, so both streams are checked for the 500 status.
|
||||
Uses stderr=STDOUT to merge both streams into stdout, ensuring all
|
||||
output is captured in one place (docker push output behavior varies
|
||||
depending on TTY detection).
|
||||
"""
|
||||
result = subprocess.run( # nosec B603
|
||||
cmd,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT,
|
||||
text=True,
|
||||
check=False,
|
||||
)
|
||||
if result.returncode != 0 and "500" in (result.stdout or ""):
|
||||
raise PushHTTP500Error(result.stdout.strip())
|
||||
return result
|
||||
|
||||
|
||||
def push_image(
|
||||
spec: ImageSpec,
|
||||
registry: str,
|
||||
@@ -296,59 +265,12 @@ def push_image(
|
||||
"""Push all tags of a Docker image to the registry.
|
||||
|
||||
Returns True if all pushes succeed, False if any fail.
|
||||
|
||||
Push-first strategy: try pushing directly. Only if the push fails
|
||||
with Gitea #31964 ("package version already exists") do we delete
|
||||
the old manifest and retry. This avoids losing the existing tag
|
||||
when the push fails for unrelated reasons (e.g. HTTP 500).
|
||||
|
||||
HTTP 500 errors from the Gitea registry race condition are retried
|
||||
up to 3 times with exponential backoff (5s, 10s) via tenacity.
|
||||
"""
|
||||
full_tags = [build_full_tag(registry, spec.name, t) for t in spec.tags]
|
||||
all_ok = True
|
||||
for ft, tag in zip(full_tags, spec.tags, strict=False):
|
||||
cmd = ["docker", "push", ft]
|
||||
if dry_run:
|
||||
click.echo(f"[dry-run] {' '.join(cmd)}")
|
||||
continue
|
||||
click.echo(f"Pushing {ft}...")
|
||||
|
||||
@retry(
|
||||
stop=stop_after_attempt(5),
|
||||
wait=wait_exponential(multiplier=10, min=10, max=60),
|
||||
retry=retry_if_exception_type(PushHTTP500Error),
|
||||
before_sleep=lambda retry_state: click.echo(
|
||||
_(
|
||||
" HTTP 500 from registry, retrying in {wait:.0f}s (attempt {attempt}/5)...",
|
||||
wait=retry_state.next_action.sleep if retry_state.next_action else 0,
|
||||
attempt=retry_state.attempt_number + 1,
|
||||
),
|
||||
err=True,
|
||||
),
|
||||
reraise=True,
|
||||
)
|
||||
def _attempt(_cmd: list[str] = cmd) -> subprocess.CompletedProcess[str]:
|
||||
return _run_push(_cmd)
|
||||
|
||||
try:
|
||||
result = _attempt()
|
||||
except PushHTTP500Error as e:
|
||||
click.echo(
|
||||
_("Push failed for {tag}: {error}", tag=ft, error=str(e)),
|
||||
err=True,
|
||||
)
|
||||
all_ok = False
|
||||
continue
|
||||
|
||||
if result.returncode == 0:
|
||||
click.echo(f"Pushed {ft}")
|
||||
continue
|
||||
combined_output = (result.stdout or "").strip()
|
||||
# Gitea #31964: push fails because tag already exists.
|
||||
# Delete the old manifest and retry once.
|
||||
if username and token and "already exists" in combined_output.lower():
|
||||
click.echo(" Tag exists (Gitea #31964), deleting old manifest and retrying...")
|
||||
# Workaround for Gitea #31964: delete existing tag before push
|
||||
if username and token:
|
||||
delete_remote_manifest(
|
||||
registry,
|
||||
spec.name,
|
||||
@@ -357,23 +279,25 @@ def push_image(
|
||||
token,
|
||||
dry_run=dry_run,
|
||||
)
|
||||
click.echo(f" Retrying push {ft}...")
|
||||
result = subprocess.run( # nosec B603
|
||||
cmd,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT,
|
||||
text=True,
|
||||
check=False,
|
||||
)
|
||||
if result.returncode == 0:
|
||||
click.echo(f"Pushed {ft} (after retry)")
|
||||
continue
|
||||
combined_output = (result.stdout or "").strip()
|
||||
click.echo(
|
||||
_("Push failed for {tag}: {error}", tag=ft, error=combined_output),
|
||||
err=True,
|
||||
cmd = ["docker", "push", ft]
|
||||
if dry_run:
|
||||
click.echo(f"[dry-run] {' '.join(cmd)}")
|
||||
continue
|
||||
click.echo(f"Pushing {ft}...")
|
||||
result = subprocess.run( # nosec B603
|
||||
cmd,
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=False,
|
||||
)
|
||||
all_ok = False
|
||||
if result.returncode != 0:
|
||||
click.echo(
|
||||
_("Push failed for {tag}: {error}", tag=ft, error=result.stderr.strip()),
|
||||
err=True,
|
||||
)
|
||||
all_ok = False
|
||||
else:
|
||||
click.echo(f"Pushed {ft}")
|
||||
return all_ok
|
||||
|
||||
|
||||
|
||||
@@ -5152,13 +5152,5 @@
|
||||
"pl": "PR has 'refactoring' label — size check bypassed.",
|
||||
"ru": "PR has 'refactoring' label — size check bypassed.",
|
||||
"zh": "PR has 'refactoring' label — size check bypassed."
|
||||
},
|
||||
" HTTP 500 from registry, retrying in {wait:.0f}s (attempt {attempt}/5)...": {
|
||||
"en": "HTTP 500 from registry, retrying in {wait:.0f}s (attempt {attempt}/5)...",
|
||||
"bg": " HTTP 500 от регистъра, повторен опит след {wait:.0f}с (опит {attempt}/5)...",
|
||||
"de": " HTTP 500 vom Registry, Wiederholung in {wait:.0f}s (Versuch {attempt}/5)...",
|
||||
"pl": " HTTP 500 z rejestru, ponawianie za {wait:.0f}s (próba {attempt}/5)...",
|
||||
"ru": " HTTP 500 от реестра, повтор через {wait:.0f}с (попытка {attempt}/5)...",
|
||||
"zh": " 注册表返回 HTTP 500，{wait:.0f}秒后重试（第{attempt}/5次尝试）..."
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,6 @@ from click.testing import CliRunner
|
||||
import devx.tools.build_image as build_image
|
||||
from devx.tools.build_image import (
|
||||
ImageSpec,
|
||||
PushHTTP500Error,
|
||||
build_full_tag,
|
||||
delete_remote_manifest,
|
||||
load_manifest,
|
||||
@@ -198,7 +197,7 @@ class TestBuildImage:
|
||||
class TestPushImage:
|
||||
def test_success(self) -> None:
|
||||
spec = ImageSpec(name="ci-base", dockerfile="Dockerfile", tags=["latest", "1.0"])
|
||||
mock_result = MagicMock(returncode=0, stdout="")
|
||||
mock_result = MagicMock(returncode=0, stderr="", stdout="")
|
||||
with patch("devx.tools.build_image.subprocess.run", return_value=mock_result) as mock_run:
|
||||
assert push_image(spec, "git.example.com") is True
|
||||
assert mock_run.call_count == 2
|
||||
@@ -206,8 +205,8 @@ class TestPushImage:
|
||||
def test_partial_failure(self) -> None:
|
||||
spec = ImageSpec(name="ci-base", dockerfile="Dockerfile", tags=["latest", "1.0"])
|
||||
results = [
|
||||
MagicMock(returncode=0, stdout=""),
|
||||
MagicMock(returncode=1, stdout="push failed"),
|
||||
MagicMock(returncode=0, stderr="", stdout=""),
|
||||
MagicMock(returncode=1, stderr="push failed", stdout=""),
|
||||
]
|
||||
with patch("devx.tools.build_image.subprocess.run", side_effect=results):
|
||||
assert push_image(spec, "git.example.com") is False
|
||||
@@ -218,36 +217,11 @@ class TestPushImage:
|
||||
assert push_image(spec, "git.example.com", dry_run=True) is True
|
||||
mock_run.assert_not_called()
|
||||
|
||||
def test_no_delete_on_success_with_creds(self) -> None:
|
||||
"""Push-first: no delete needed when push succeeds."""
|
||||
def test_delete_before_push_with_creds(self) -> None:
|
||||
spec = ImageSpec(name="ci-base", dockerfile="Dockerfile", tags=["latest"])
|
||||
mock_result = MagicMock(returncode=0, stdout="")
|
||||
mock_result = MagicMock(returncode=0, stderr="", stdout="")
|
||||
with (
|
||||
patch("devx.tools.build_image.subprocess.run", return_value=mock_result),
|
||||
patch("devx.tools.build_image.delete_remote_manifest") as mock_del,
|
||||
):
|
||||
assert push_image(spec, "git.example.com", username="user", token="tok") is True
|
||||
mock_del.assert_not_called()
|
||||
|
||||
def test_no_delete_without_creds(self) -> None:
|
||||
spec = ImageSpec(name="ci-base", dockerfile="Dockerfile", tags=["latest"])
|
||||
mock_result = MagicMock(returncode=0, stdout="")
|
||||
with (
|
||||
patch("devx.tools.build_image.subprocess.run", return_value=mock_result),
|
||||
patch("devx.tools.build_image.delete_remote_manifest") as mock_del,
|
||||
):
|
||||
assert push_image(spec, "git.example.com") is True
|
||||
mock_del.assert_not_called()
|
||||
|
||||
def test_delete_and_retry_on_already_exists(self) -> None:
|
||||
"""Gitea #31964: push fails with 'already exists', delete + retry."""
|
||||
spec = ImageSpec(name="ci-base", dockerfile="Dockerfile", tags=["latest"])
|
||||
results = [
|
||||
MagicMock(returncode=1, stdout="package version already exists"),
|
||||
MagicMock(returncode=0, stdout=""),
|
||||
]
|
||||
with (
|
||||
patch("devx.tools.build_image.subprocess.run", side_effect=results),
|
||||
patch("devx.tools.build_image.delete_remote_manifest", return_value=True) as mock_del,
|
||||
):
|
||||
assert push_image(spec, "git.example.com", username="user", token="tok") is True
|
||||
@@ -260,84 +234,16 @@ class TestPushImage:
|
||||
dry_run=False,
|
||||
)
|
||||
|
||||
def test_no_delete_on_non_already_exists_failure(self) -> None:
|
||||
"""Push fails for other reasons (non-500) — old manifest preserved."""
|
||||
def test_no_delete_without_creds(self) -> None:
|
||||
spec = ImageSpec(name="ci-base", dockerfile="Dockerfile", tags=["latest"])
|
||||
mock_result = MagicMock(returncode=1, stdout="denied: requested access to the resource is denied")
|
||||
mock_result = MagicMock(returncode=0, stderr="", stdout="")
|
||||
with (
|
||||
patch("devx.tools.build_image.subprocess.run", return_value=mock_result),
|
||||
patch("devx.tools.build_image.delete_remote_manifest") as mock_del,
|
||||
):
|
||||
assert push_image(spec, "git.example.com", username="user", token="tok") is False
|
||||
assert push_image(spec, "git.example.com") is True
|
||||
mock_del.assert_not_called()
|
||||
|
||||
def test_retry_also_fails(self) -> None:
|
||||
"""Gitea #31964 retry also fails — both pushes fail."""
|
||||
spec = ImageSpec(name="ci-base", dockerfile="Dockerfile", tags=["latest"])
|
||||
results = [
|
||||
MagicMock(returncode=1, stdout="package version already exists"),
|
||||
MagicMock(returncode=1, stdout="push failed again"),
|
||||
]
|
||||
with (
|
||||
patch("devx.tools.build_image.subprocess.run", side_effect=results),
|
||||
patch("devx.tools.build_image.delete_remote_manifest", return_value=True),
|
||||
):
|
||||
assert push_image(spec, "git.example.com", username="user", token="tok") is False
|
||||
|
||||
def test_http_500_retries_then_succeeds(self) -> None:
|
||||
"""HTTP 500 from registry race condition — retry succeeds."""
|
||||
spec = ImageSpec(name="ci-base", dockerfile="Dockerfile", tags=["latest"])
|
||||
results = [
|
||||
MagicMock(returncode=1, stdout="received unexpected HTTP status: 500 Internal Server Error"),
|
||||
MagicMock(returncode=0, stdout=""),
|
||||
]
|
||||
with (
|
||||
patch("devx.tools.build_image.subprocess.run", side_effect=results),
|
||||
patch("devx.tools.build_image.delete_remote_manifest") as mock_del,
|
||||
patch("time.sleep"),
|
||||
):
|
||||
assert push_image(spec, "git.example.com", username="user", token="tok") is True
|
||||
mock_del.assert_not_called()
|
||||
|
||||
def test_http_500_retries_all_fail(self) -> None:
|
||||
"""HTTP 500 retries exhausted — push fails, no delete attempted."""
|
||||
spec = ImageSpec(name="ci-base", dockerfile="Dockerfile", tags=["latest"])
|
||||
mock_result = MagicMock(returncode=1, stdout="received unexpected HTTP status: 500 Internal Server Error")
|
||||
with (
|
||||
patch("devx.tools.build_image.subprocess.run", return_value=mock_result),
|
||||
patch("devx.tools.build_image.delete_remote_manifest") as mock_del,
|
||||
patch("time.sleep"),
|
||||
):
|
||||
assert push_image(spec, "git.example.com", username="user", token="tok") is False
|
||||
mock_del.assert_not_called()
|
||||
|
||||
def test_run_push_raises_on_500(self) -> None:
|
||||
"""_run_push raises PushHTTP500Error when stdout contains 500."""
|
||||
from devx.tools.build_image import _run_push
|
||||
|
||||
mock_result = MagicMock(returncode=1, stdout="received unexpected HTTP status: 500 Internal Server Error")
|
||||
with patch("devx.tools.build_image.subprocess.run", return_value=mock_result):
|
||||
with pytest.raises(PushHTTP500Error, match="500"):
|
||||
_run_push(["docker", "push", "img:latest"])
|
||||
|
||||
def test_run_push_no_raise_on_non_500(self) -> None:
|
||||
"""_run_push returns result when stdout has no 500."""
|
||||
from devx.tools.build_image import _run_push
|
||||
|
||||
mock_result = MagicMock(returncode=1, stdout="denied: access denied")
|
||||
with patch("devx.tools.build_image.subprocess.run", return_value=mock_result):
|
||||
result = _run_push(["docker", "push", "img:latest"])
|
||||
assert result.returncode == 1
|
||||
|
||||
def test_run_push_no_raise_on_success(self) -> None:
|
||||
"""_run_push returns result on success."""
|
||||
from devx.tools.build_image import _run_push
|
||||
|
||||
mock_result = MagicMock(returncode=0, stdout="")
|
||||
with patch("devx.tools.build_image.subprocess.run", return_value=mock_result):
|
||||
result = _run_push(["docker", "push", "img:latest"])
|
||||
assert result.returncode == 0
|
||||
|
||||
|
||||
class TestDeleteRemoteManifest:
|
||||
def test_dry_run(self) -> None:
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
"""Structural tests for spec-driven development workflows and skills in devx.
|
||||
"""Structural tests for spec-driven development workflows and skills.
|
||||
|
||||
These tests parse devx's own workflow YAML files and assert that the
|
||||
spec-driven development steps, jobs, and env vars are present and
|
||||
correctly wired. They also validate that the skills exist in devx's
|
||||
own .devin/skills/ directory with required sections.
|
||||
These tests parse the actual workflow YAML files in each repo and assert
|
||||
that the new spec-driven development steps, jobs, and env vars are present
|
||||
and correctly wired. They also validate that the spec-driven-development
|
||||
skill exists in each repo's .devin/skills/ directory with required sections.
|
||||
|
||||
devx must NOT be aware of other repos (infra, grm, sso-bridge). Those
|
||||
repos consume devx; devx does not test them.
|
||||
This is a "contract test" — it verifies that the workflows we wrote match
|
||||
the intended structure, catching regressions if someone edits a workflow
|
||||
and accidentally removes a step or breaks a job dependency.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
@@ -16,26 +17,38 @@ from pathlib import Path
|
||||
import pytest
|
||||
import yaml
|
||||
|
||||
# devx repo root
|
||||
# Repo root paths
|
||||
# __file__ = .../devx/tests/unit/test_spec_driven_workflows.py
|
||||
# parents[2] = .../devx
|
||||
_DEVX = Path(__file__).resolve().parents[2]
|
||||
# parents[3] = .../oblachno (the monorepo root containing all repos)
|
||||
_OBLACHNO_ROOT = Path(__file__).resolve().parents[3]
|
||||
_INFRA = _OBLACHNO_ROOT / "infra"
|
||||
_GRM = _OBLACHNO_ROOT / "grm"
|
||||
_SSO_BRIDGE = _OBLACHNO_ROOT / "sso-bridge"
|
||||
_DEVX = _OBLACHNO_ROOT / "devx"
|
||||
|
||||
|
||||
def _load_workflow(filename: str) -> dict:
|
||||
"""Load a devx workflow YAML file and return parsed dict."""
|
||||
path = _DEVX / ".gitea" / "workflows" / filename
|
||||
def _load_workflow(repo_path: Path, filename: str) -> dict:
|
||||
"""Load a workflow YAML file and return parsed dict."""
|
||||
path = repo_path / ".gitea" / "workflows" / filename
|
||||
if not path.exists():
|
||||
pytest.skip(f"Workflow {filename} not found in devx")
|
||||
pytest.skip(f"Workflow {filename} not found in {repo_path.name}")
|
||||
with open(path, encoding="utf-8") as f:
|
||||
return yaml.safe_load(f)
|
||||
|
||||
|
||||
def _read_skill(skill_name: str) -> str:
|
||||
"""Read a skill file from devx's .devin/skills/ directory."""
|
||||
skill_path = _DEVX / ".devin" / "skills" / skill_name / "SKILL.md"
|
||||
def _skip_if_repo_missing(repo_name: str) -> None:
|
||||
"""Skip test if the sibling repo directory doesn't exist (CI only checks out one repo)."""
|
||||
repo_path = _OBLACHNO_ROOT / repo_name
|
||||
if not repo_path.is_dir():
|
||||
pytest.skip(f"Repo {repo_name} not found at {repo_path} (CI only checks out devx)")
|
||||
|
||||
|
||||
def _read_skill(repo_name: str, skill_name: str) -> str:
|
||||
"""Read a skill file from a repo, skipping if the repo or file doesn't exist."""
|
||||
_skip_if_repo_missing(repo_name)
|
||||
skill_path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / skill_name / "SKILL.md"
|
||||
if not skill_path.exists():
|
||||
pytest.fail(f"SKILL.md not found for {skill_name} in devx")
|
||||
pytest.skip(f"SKILL.md not found in {repo_name}/{skill_name}")
|
||||
return skill_path.read_text(encoding="utf-8")
|
||||
|
||||
|
||||
@@ -62,14 +75,14 @@ def _get_run_commands(step: dict) -> str:
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# devx ci.yml — spec validation + PR size
|
||||
# Infra ci.yml — spec validation + PR size + fast molecule
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestDevxCiWorkflow:
|
||||
class TestInfraCiWorkflow:
|
||||
@pytest.fixture
|
||||
def workflow(self) -> dict:
|
||||
return _load_workflow("ci.yml")
|
||||
return _load_workflow(_INFRA, "ci.yml")
|
||||
|
||||
def test_validate_job_exists(self, workflow: dict) -> None:
|
||||
assert "validate" in workflow["jobs"]
|
||||
@@ -100,36 +113,321 @@ class TestDevxCiWorkflow:
|
||||
step = _find_step(workflow["jobs"]["validate"], "Validate spec file")
|
||||
assert step is not None
|
||||
env = step.get("env", {})
|
||||
assert env.get("DEVX_TASK_PREFIX") == "DEVX"
|
||||
assert env.get("DEVX_TASK_PREFIX") == "OBL-INFRA"
|
||||
|
||||
def test_has_auto_merge_job(self, workflow: dict) -> None:
|
||||
assert "auto-merge" in workflow["jobs"], "ci.yml must have 'auto-merge' job"
|
||||
def test_has_fast_molecule_job(self, workflow: dict) -> None:
|
||||
assert "fast-molecule" in workflow["jobs"], "ci.yml must have 'fast-molecule' job (replaced molecule-tests)"
|
||||
|
||||
def test_no_full_molecule_tests_job(self, workflow: dict) -> None:
|
||||
assert "molecule-tests" not in workflow["jobs"], "ci.yml must NOT have 'molecule-tests' job (moved to nightly)"
|
||||
|
||||
def test_no_staging_deploy_in_ci(self, workflow: dict) -> None:
|
||||
# The staging deploy was moved to post-merge (auto-deploy-staging)
|
||||
job_names = list(workflow["jobs"].keys())
|
||||
assert "staging-health-gate" not in job_names, "staging-health-gate removed from ci.yml (moved to nightly)"
|
||||
assert "pre-deploy-checks" not in job_names, "pre-deploy-checks removed from ci.yml (moved to nightly)"
|
||||
assert "deploy" not in job_names, "deploy job removed from ci.yml (moved to post-merge)"
|
||||
|
||||
def test_fast_molecule_uses_devx_module(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"]["fast-molecule"]
|
||||
step = _find_step(job, "Detect changed roles")
|
||||
assert step is not None
|
||||
cmd = _get_run_commands(step)
|
||||
assert "devx.ci.fast_molecule" in cmd
|
||||
assert "--github-output" in cmd
|
||||
|
||||
def test_fast_molecule_timeout_is_short(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"]["fast-molecule"]
|
||||
assert job.get("timeout-minutes", 999) <= 30, (
|
||||
"fast-molecule timeout should be <= 30 min (was 120 for full suite)"
|
||||
)
|
||||
|
||||
def test_fast_molecule_no_matrix(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"]["fast-molecule"]
|
||||
assert "strategy" not in job or "matrix" not in job.get("strategy", {}), (
|
||||
"fast-molecule should not use matrix (single runner)"
|
||||
)
|
||||
|
||||
def test_auto_merge_depends_on_fast_molecule(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"].get("auto-merge", {})
|
||||
needs = job.get("needs", [])
|
||||
assert "fast-molecule" in needs, "auto-merge must depend on fast-molecule (not deploy)"
|
||||
|
||||
def test_auto_merge_does_not_depend_on_deploy(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"].get("auto-merge", {})
|
||||
needs = job.get("needs", [])
|
||||
assert "deploy" not in needs, "auto-merge must NOT depend on deploy (removed from PR pipeline)"
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# devx post-merge.yml — release + publish
|
||||
# Infra nightly.yml — full molecule + staging deploy + gate
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestDevxPostMergeWorkflow:
|
||||
class TestInfraNightlyWorkflow:
|
||||
@pytest.fixture
|
||||
def workflow(self) -> dict:
|
||||
return _load_workflow("post-merge.yml")
|
||||
return _load_workflow(_INFRA, "nightly.yml")
|
||||
|
||||
def test_nightly_workflow_exists(self, workflow: dict) -> None:
|
||||
assert workflow is not None
|
||||
|
||||
def test_has_full_molecule_job(self, workflow: dict) -> None:
|
||||
assert "full-molecule" in workflow["jobs"]
|
||||
|
||||
def test_has_set_gate_status_job(self, workflow: dict) -> None:
|
||||
assert "set-gate-status" in workflow["jobs"]
|
||||
|
||||
def test_has_staging_deploy_job(self, workflow: dict) -> None:
|
||||
assert "staging-deploy" in workflow["jobs"]
|
||||
|
||||
def test_full_molecule_uses_matrix(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"]["full-molecule"]
|
||||
strategy = job.get("strategy", {})
|
||||
assert "matrix" in strategy, "full-molecule must use matrix (6 runners)"
|
||||
assert "runner-index" in strategy["matrix"]
|
||||
|
||||
def test_full_molecule_timeout_is_long(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"]["full-molecule"]
|
||||
assert job.get("timeout-minutes", 0) >= 90, "full-molecule timeout should be >= 90 min (full suite)"
|
||||
|
||||
def test_set_gate_status_depends_on_full_molecule(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"]["set-gate-status"]
|
||||
needs = job.get("needs", [])
|
||||
assert "full-molecule" in needs
|
||||
|
||||
def test_set_gate_status_uses_nightly_gate_module(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"]["set-gate-status"]
|
||||
step = _find_step(job, "Set nightly gate")
|
||||
assert step is not None
|
||||
cmd = _get_run_commands(step)
|
||||
assert "devx.ci.nightly_gate" in cmd
|
||||
assert "set-passed" in cmd or "set-failed" in cmd
|
||||
|
||||
def test_staging_deploy_depends_on_gate(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"]["staging-deploy"]
|
||||
needs = job.get("needs", [])
|
||||
assert "set-gate-status" in needs
|
||||
assert "full-molecule" in needs
|
||||
|
||||
def test_staging_deploy_only_on_success(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"]["staging-deploy"]
|
||||
if_cond = job.get("if", "")
|
||||
assert "success" in if_cond, "staging-deploy must only run when full-molecule succeeds"
|
||||
|
||||
def test_nightly_runs_on_schedule(self, workflow: dict) -> None:
|
||||
on = workflow.get("on", workflow.get(True, {}))
|
||||
# YAML may parse 'on' as True (boolean)
|
||||
if isinstance(on, dict):
|
||||
assert "schedule" in on, "nightly must have schedule trigger"
|
||||
else:
|
||||
pytest.fail("Could not parse 'on' trigger from nightly.yml")
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Infra post-merge.yml — auto-deploy staging with nightly gate
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestInfraPostMergeWorkflow:
|
||||
@pytest.fixture
|
||||
def workflow(self) -> dict:
|
||||
return _load_workflow(_INFRA, "post-merge.yml")
|
||||
|
||||
def test_has_auto_deploy_staging_job(self, workflow: dict) -> None:
|
||||
assert "auto-deploy-staging" in workflow["jobs"], "post-merge must have 'auto-deploy-staging' job"
|
||||
|
||||
def test_has_staging_deploy_job(self, workflow: dict) -> None:
|
||||
assert "staging-deploy" in workflow["jobs"], "post-merge must have 'staging-deploy' reusable workflow job"
|
||||
|
||||
def test_auto_deploy_staging_checks_nightly_gate(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"]["auto-deploy-staging"]
|
||||
step = _find_step(job, "Check nightly gate")
|
||||
assert step is not None
|
||||
cmd = _get_run_commands(step)
|
||||
assert "devx.ci.nightly_gate" in cmd
|
||||
assert "--action check" in cmd
|
||||
|
||||
def test_staging_deploy_depends_on_auto_deploy_staging(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"]["staging-deploy"]
|
||||
needs = job.get("needs", [])
|
||||
assert "auto-deploy-staging" in needs
|
||||
|
||||
def test_staging_deploy_gated_on_gate_passed(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"]["staging-deploy"]
|
||||
if_cond = job.get("if", "")
|
||||
assert "gate-passed" in if_cond, "staging-deploy must check gate-passed output"
|
||||
|
||||
def test_auto_deploy_production_waits_for_staging(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"].get("auto-deploy-production", {})
|
||||
needs = job.get("needs", [])
|
||||
assert "staging-deploy" in needs, "auto-deploy-production must wait for staging-deploy"
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# GRM ci.yml — spec validation + PR size
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestGrmCiWorkflow:
|
||||
@pytest.fixture
|
||||
def workflow(self) -> dict:
|
||||
return _load_workflow(_GRM, "ci.yml")
|
||||
|
||||
def test_has_spec_validation_step(self, workflow: dict) -> None:
|
||||
steps = _get_step_names(workflow["jobs"]["validate"])
|
||||
assert any("Validate spec file" in s for s in steps)
|
||||
|
||||
def test_has_pr_size_check_step(self, workflow: dict) -> None:
|
||||
steps = _get_step_names(workflow["jobs"]["validate"])
|
||||
assert any("Check PR size" in s for s in steps)
|
||||
|
||||
def test_spec_validation_sets_task_prefix(self, workflow: dict) -> None:
|
||||
step = _find_step(workflow["jobs"]["validate"], "Validate spec file")
|
||||
assert step is not None
|
||||
env = step.get("env", {})
|
||||
assert env.get("DEVX_TASK_PREFIX") == "GRM"
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# GRM post-merge.yml — auto-create infra dependency PR
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestGrmPostMergeWorkflow:
|
||||
@pytest.fixture
|
||||
def workflow(self) -> dict:
|
||||
return _load_workflow(_GRM, "post-merge.yml")
|
||||
|
||||
def test_has_create_dependency_pr_step(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"].get("release-and-maintain", {})
|
||||
step = _find_step(job, "Create infra dependency PR")
|
||||
assert step is not None, "grm post-merge must have 'Create infra dependency PR' step"
|
||||
|
||||
def test_dependency_pr_uses_correct_module(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"].get("release-and-maintain", {})
|
||||
step = _find_step(job, "Create infra dependency PR")
|
||||
assert step is not None
|
||||
cmd = _get_run_commands(step)
|
||||
assert "devx.ci.create_dependency_pr" in cmd
|
||||
assert "--package grm" in cmd
|
||||
assert "--repo oblachno/infra" in cmd
|
||||
|
||||
def test_dependency_pr_is_best_effort(self, workflow: dict) -> None:
|
||||
import re
|
||||
|
||||
job = workflow["jobs"].get("release-and-maintain", {})
|
||||
step = _find_step(job, "Create infra dependency PR")
|
||||
assert step is not None
|
||||
cmd = _get_run_commands(step)
|
||||
# Must not fail the workflow if PR creation fails.
|
||||
# The || echo may be split across lines with backslash continuation in YAML.
|
||||
# Normalize: remove backslashes and collapse whitespace.
|
||||
cmd_normalized = " ".join(cmd.replace("\\", " ").split())
|
||||
assert bool(re.search(r"\|\|\s*echo", cmd_normalized)) or "continue-on-error" in step, (
|
||||
"dependency PR step must be best-effort (|| echo or continue-on-error)"
|
||||
)
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# sso-bridge ci.yml — spec validation + PR size
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestSsoBridgeCiWorkflow:
|
||||
@pytest.fixture
|
||||
def workflow(self) -> dict:
|
||||
return _load_workflow(_SSO_BRIDGE, "ci.yml")
|
||||
|
||||
def test_has_spec_validation_step(self, workflow: dict) -> None:
|
||||
steps = _get_step_names(workflow["jobs"]["validate"])
|
||||
assert any("Validate spec file" in s for s in steps)
|
||||
|
||||
def test_has_pr_size_check_step(self, workflow: dict) -> None:
|
||||
steps = _get_step_names(workflow["jobs"]["validate"])
|
||||
assert any("Check PR size" in s for s in steps)
|
||||
|
||||
def test_spec_validation_sets_task_prefix(self, workflow: dict) -> None:
|
||||
step = _find_step(workflow["jobs"]["validate"], "Validate spec file")
|
||||
assert step is not None
|
||||
env = step.get("env", {})
|
||||
assert env.get("DEVX_TASK_PREFIX") == "SSO"
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# sso-bridge post-merge.yml — auto-publish + auto-create dependency PR
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestSsoBridgePostMergeWorkflow:
|
||||
@pytest.fixture
|
||||
def workflow(self) -> dict:
|
||||
return _load_workflow(_SSO_BRIDGE, "post-merge.yml")
|
||||
|
||||
def test_post_merge_workflow_exists(self, workflow: dict) -> None:
|
||||
assert workflow is not None
|
||||
|
||||
def test_has_release_and_maintain_job(self, workflow: dict) -> None:
|
||||
assert "release-and-maintain" in workflow["jobs"], "post-merge must have 'release-and-maintain' job"
|
||||
assert "release-and-maintain" in workflow["jobs"]
|
||||
|
||||
def test_has_create_dependency_pr_step(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"].get("release-and-maintain", {})
|
||||
step = _find_step(job, "Create infra dependency PR")
|
||||
assert step is not None
|
||||
|
||||
def test_dependency_pr_uses_correct_module(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"].get("release-and-maintain", {})
|
||||
step = _find_step(job, "Create infra dependency PR")
|
||||
assert step is not None
|
||||
cmd = _get_run_commands(step)
|
||||
assert "devx.ci.create_dependency_pr" in cmd
|
||||
assert "--package sso_bridge" in cmd
|
||||
assert "--repo oblachno/infra" in cmd
|
||||
|
||||
def test_dependency_pr_is_best_effort(self, workflow: dict) -> None:
|
||||
import re
|
||||
|
||||
job = workflow["jobs"].get("release-and-maintain", {})
|
||||
step = _find_step(job, "Create infra dependency PR")
|
||||
assert step is not None
|
||||
cmd = _get_run_commands(step)
|
||||
# The || echo may be split across lines with backslash continuation in YAML.
|
||||
cmd_normalized = " ".join(cmd.replace("\\", " ").split())
|
||||
assert bool(re.search(r"\|\|\s*echo", cmd_normalized)) or "continue-on-error" in step
|
||||
|
||||
def test_has_publish_step(self, workflow: dict) -> None:
|
||||
job = workflow["jobs"].get("release-and-maintain", {})
|
||||
steps = _get_step_names(job)
|
||||
assert any("publish" in s.lower() for s in steps), "post-merge must have a publish step"
|
||||
assert any("publish" in s.lower() for s in steps), "sso-bridge post-merge must have a publish step"
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Skill files — spec-driven-development SKILL.md in devx
|
||||
# devx ci.yml — spec validation + PR size
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestDevxCiWorkflow:
|
||||
@pytest.fixture
|
||||
def workflow(self) -> dict:
|
||||
return _load_workflow(_DEVX, "ci.yml")
|
||||
|
||||
def test_has_spec_validation_step(self, workflow: dict) -> None:
|
||||
steps = _get_step_names(workflow["jobs"]["validate"])
|
||||
assert any("Validate spec file" in s for s in steps)
|
||||
|
||||
def test_has_pr_size_check_step(self, workflow: dict) -> None:
|
||||
steps = _get_step_names(workflow["jobs"]["validate"])
|
||||
assert any("Check PR size" in s for s in steps)
|
||||
|
||||
def test_spec_validation_sets_task_prefix(self, workflow: dict) -> None:
|
||||
step = _find_step(workflow["jobs"]["validate"], "Validate spec file")
|
||||
assert step is not None
|
||||
env = step.get("env", {})
|
||||
assert env.get("DEVX_TASK_PREFIX") == "DEVX"
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Skill files — spec-driven-development SKILL.md in all repos
|
||||
# ============================================================================
|
||||
|
||||
|
||||
@@ -142,96 +440,227 @@ class TestSpecDrivenDevelopmentSkill:
|
||||
"## Acceptance Criteria",
|
||||
]
|
||||
|
||||
def test_skill_exists_in_repo(self) -> None:
|
||||
skill_path = _DEVX / ".devin" / "skills" / "spec-driven-development" / "SKILL.md"
|
||||
assert skill_path.exists(), "SKILL.md not found in devx"
|
||||
@pytest.mark.parametrize("repo_name", ["infra", "grm", "sso-bridge", "devx"])
|
||||
def test_skill_exists_in_repo(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
skill_path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "spec-driven-development" / "SKILL.md"
|
||||
assert skill_path.exists(), f"SKILL.md not found in {repo_name}"
|
||||
|
||||
def test_skill_has_required_sections(self) -> None:
|
||||
content = _read_skill("spec-driven-development")
|
||||
@pytest.mark.parametrize("repo_name", ["infra", "grm", "sso-bridge", "devx"])
|
||||
def test_skill_has_required_sections(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
skill_path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "spec-driven-development" / "SKILL.md"
|
||||
content = skill_path.read_text(encoding="utf-8")
|
||||
for section in self.REQUIRED_SECTIONS:
|
||||
assert section in content, f"SKILL.md missing section: {section}"
|
||||
assert section in content, f"SKILL.md in {repo_name} missing section: {section}"
|
||||
|
||||
def test_skill_mentions_req_ids(self) -> None:
|
||||
content = _read_skill("spec-driven-development")
|
||||
assert "REQ-" in content, "SKILL.md must mention REQ-ID format"
|
||||
@pytest.mark.parametrize("repo_name", ["infra", "grm", "sso-bridge", "devx"])
|
||||
def test_skill_mentions_req_ids(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
skill_path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "spec-driven-development" / "SKILL.md"
|
||||
content = skill_path.read_text(encoding="utf-8")
|
||||
assert "REQ-" in content, f"SKILL.md in {repo_name} must mention REQ-ID format"
|
||||
|
||||
def test_skill_mentions_pr_size_limit(self) -> None:
|
||||
content = _read_skill("spec-driven-development")
|
||||
assert "500" in content, "SKILL.md must mention 500 line PR size limit"
|
||||
@pytest.mark.parametrize("repo_name", ["infra", "grm", "sso-bridge", "devx"])
|
||||
def test_skill_mentions_pr_size_limit(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
skill_path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "spec-driven-development" / "SKILL.md"
|
||||
content = skill_path.read_text(encoding="utf-8")
|
||||
assert "500" in content, f"SKILL.md in {repo_name} must mention 500 line PR size limit"
|
||||
|
||||
def test_skill_mentions_nightly_gate(self) -> None:
|
||||
content = _read_skill("spec-driven-development")
|
||||
assert "nightly" in content.lower(), "SKILL.md must mention nightly gate"
|
||||
@pytest.mark.parametrize("repo_name", ["infra", "grm", "sso-bridge", "devx"])
|
||||
def test_skill_mentions_nightly_gate(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
skill_path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "spec-driven-development" / "SKILL.md"
|
||||
content = skill_path.read_text(encoding="utf-8")
|
||||
assert "nightly" in content.lower(), f"SKILL.md in {repo_name} must mention nightly gate"
|
||||
|
||||
def test_skill_exists_in_shared_dir(self) -> None:
|
||||
skill_path = _OBLACHNO_ROOT / ".devin" / "skills" / "spec-driven-development" / "SKILL.md"
|
||||
if not skill_path.exists():
|
||||
pytest.skip("Shared .devin/skills/ not found (CI only checks out devx repo)")
|
||||
assert skill_path.exists(), "SKILL.md not found in shared .devin/skills/"
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# devx-workflow skill — exists in devx, mentions spec gates
|
||||
# devx-workflow skill — exists in repos with PR workflow, mentions spec gates
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestDevxWorkflowSkill:
|
||||
def test_skill_exists(self) -> None:
|
||||
path = _DEVX / ".devin" / "skills" / "devx-workflow" / "SKILL.md"
|
||||
assert path.exists(), "devx-workflow SKILL.md not found in devx"
|
||||
# Repos that have a PR workflow and need the devx-workflow skill
|
||||
REPOS_WITH_PR_WORKFLOW = ["infra", "grm", "sso-bridge", "devx"]
|
||||
|
||||
def test_mentions_spec_validation(self) -> None:
|
||||
content = _read_skill("devx-workflow")
|
||||
assert "validate_spec" in content, "devx-workflow skill must mention validate_spec"
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_skill_exists(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "devx-workflow" / "SKILL.md"
|
||||
assert path.exists(), f"devx-workflow SKILL.md not found in {repo_name}"
|
||||
|
||||
def test_mentions_pr_size_check(self) -> None:
|
||||
content = _read_skill("devx-workflow")
|
||||
assert "check_pr_size" in content, "devx-workflow skill must mention check_pr_size"
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_mentions_spec_validation(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "devx-workflow" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "validate_spec" in content, f"devx-workflow skill in {repo_name} must mention validate_spec"
|
||||
|
||||
def test_mentions_pr_workflow_commands(self) -> None:
|
||||
content = _read_skill("devx-workflow")
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_mentions_pr_size_check(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "devx-workflow" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "check_pr_size" in content, f"devx-workflow skill in {repo_name} must mention check_pr_size"
|
||||
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_mentions_pr_workflow_commands(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "devx-workflow" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "make create-pr" in content or "make push-with-pr" in content, (
|
||||
"devx-workflow skill must mention PR creation commands"
|
||||
f"devx-workflow skill in {repo_name} must mention PR creation commands"
|
||||
)
|
||||
|
||||
def test_mentions_auto_merge(self) -> None:
|
||||
content = _read_skill("devx-workflow")
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_mentions_auto_merge(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "devx-workflow" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "auto-merge" in content.lower() or "ready-to-merge" in content, (
|
||||
"devx-workflow skill must mention auto-merge"
|
||||
f"devx-workflow skill in {repo_name} must mention auto-merge"
|
||||
)
|
||||
|
||||
def test_has_correct_task_prefix(self) -> None:
|
||||
content = _read_skill("devx-workflow")
|
||||
assert "DEVX" in content, "devx-workflow skill must mention task prefix DEVX"
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_has_correct_task_prefix(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
"""Each repo's devx-workflow skill must mention its correct task prefix."""
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "devx-workflow" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
expected_prefixes = {
|
||||
"infra": "OBL-INFRA",
|
||||
"grm": "GRM",
|
||||
"sso-bridge": "SSO",
|
||||
"devx": "DEVX",
|
||||
}
|
||||
prefix = expected_prefixes[repo_name]
|
||||
assert prefix in content, f"devx-workflow skill in {repo_name} must mention task prefix {prefix}"
|
||||
|
||||
def test_not_in_mattermost_oidc(self) -> None:
|
||||
"""mattermost-oidc has no PR workflow — should NOT have devx-workflow skill."""
|
||||
path = _OBLACHNO_ROOT / "mattermost-oidc" / ".devin" / "skills" / "devx-workflow" / "SKILL.md"
|
||||
assert not path.exists(), "mattermost-oidc should NOT have devx-workflow skill (no PR workflow)"
|
||||
|
||||
# Repo-specific content checks
|
||||
def test_infra_mentions_nightly_gate(self) -> None:
|
||||
_skip_if_repo_missing("infra")
|
||||
path = _OBLACHNO_ROOT / "infra" / ".devin" / "skills" / "devx-workflow" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "nightly" in content.lower(), "infra devx-workflow skill must mention nightly gate"
|
||||
assert "nightly_gate" in content, "infra devx-workflow skill must mention devx.ci.nightly_gate module"
|
||||
|
||||
def test_infra_mentions_fast_molecule(self) -> None:
|
||||
_skip_if_repo_missing("infra")
|
||||
path = _OBLACHNO_ROOT / "infra" / ".devin" / "skills" / "devx-workflow" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "fast_molecule" in content, "infra devx-workflow skill must mention devx.ci.fast_molecule"
|
||||
|
||||
def test_infra_mentions_auto_deploy_staging(self) -> None:
|
||||
_skip_if_repo_missing("infra")
|
||||
path = _OBLACHNO_ROOT / "infra" / ".devin" / "skills" / "devx-workflow" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "staging" in content.lower(), "infra devx-workflow skill must mention staging auto-deploy"
|
||||
|
||||
def test_grm_mentions_dependency_pr(self) -> None:
|
||||
_skip_if_repo_missing("grm")
|
||||
path = _OBLACHNO_ROOT / "grm" / ".devin" / "skills" / "devx-workflow" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "create_dependency_pr" in content, "grm devx-workflow skill must mention create_dependency_pr"
|
||||
|
||||
def test_sso_bridge_mentions_dependency_pr(self) -> None:
|
||||
_skip_if_repo_missing("sso-bridge")
|
||||
path = _OBLACHNO_ROOT / "sso-bridge" / ".devin" / "skills" / "devx-workflow" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "create_dependency_pr" in content, "sso-bridge devx-workflow skill must mention create_dependency_pr"
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# testing-and-debugging skill — exists in devx, mentions spec workflow
|
||||
# testing-and-debugging skill — exists in all repos, mentions spec workflow
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestTestingAndDebuggingSkill:
|
||||
def test_skill_exists(self) -> None:
|
||||
path = _DEVX / ".devin" / "skills" / "testing-and-debugging" / "SKILL.md"
|
||||
assert path.exists(), "testing-and-debugging SKILL.md not found in devx"
|
||||
# All repos have a testing-and-debugging skill
|
||||
ALL_REPOS = ["infra", "grm", "sso-bridge", "devx", "mattermost-oidc"]
|
||||
|
||||
def test_has_required_sections(self) -> None:
|
||||
content = _read_skill("testing-and-debugging")
|
||||
@pytest.mark.parametrize("repo_name", ALL_REPOS)
|
||||
def test_skill_exists(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "testing-and-debugging" / "SKILL.md"
|
||||
assert path.exists(), f"testing-and-debugging SKILL.md not found in {repo_name}"
|
||||
|
||||
@pytest.mark.parametrize("repo_name", ALL_REPOS)
|
||||
def test_has_required_sections(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "testing-and-debugging" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
# All testing-and-debugging skills should have a CI failure investigation section
|
||||
assert "CI Failure Investigation" in content or "CI failure" in content, (
|
||||
"testing-and-debugging skill must have CI failure section"
|
||||
f"testing-and-debugging skill in {repo_name} must have CI failure section"
|
||||
)
|
||||
|
||||
def test_mentions_spec_driven_workflow(self) -> None:
|
||||
content = _read_skill("testing-and-debugging")
|
||||
assert "spec" in content.lower(), "testing-and-debugging skill must mention spec-driven workflow"
|
||||
# Repos with PR workflow should mention spec-driven workflow
|
||||
@pytest.mark.parametrize("repo_name", ["infra", "grm", "sso-bridge", "devx"])
|
||||
def test_mentions_spec_driven_workflow(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "testing-and-debugging" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "spec" in content.lower(), (
|
||||
f"testing-and-debugging skill in {repo_name} must mention spec-driven workflow"
|
||||
)
|
||||
|
||||
def test_infra_mentions_nightly(self) -> None:
|
||||
_skip_if_repo_missing("infra")
|
||||
path = _OBLACHNO_ROOT / "infra" / ".devin" / "skills" / "testing-and-debugging" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "nightly" in content.lower(), "infra testing-and-debugging skill must mention nightly tests"
|
||||
|
||||
def test_infra_mentions_fast_molecule(self) -> None:
|
||||
_skip_if_repo_missing("infra")
|
||||
path = _OBLACHNO_ROOT / "infra" / ".devin" / "skills" / "testing-and-debugging" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "fast" in content.lower() and "molecule" in content.lower(), (
|
||||
"infra testing-and-debugging skill must mention fast molecule"
|
||||
)
|
||||
|
||||
def test_mattermost_oidc_no_spec_mention(self) -> None:
|
||||
"""mattermost-oidc has no spec-driven workflow — skill should NOT mention it."""
|
||||
_skip_if_repo_missing("mattermost-oidc")
|
||||
path = _OBLACHNO_ROOT / "mattermost-oidc" / ".devin" / "skills" / "testing-and-debugging" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
# mattermost-oidc has no PR workflow, no spec validation
|
||||
assert "validate_spec" not in content, (
|
||||
"mattermost-oidc testing-and-debugging skill should NOT mention validate_spec"
|
||||
)
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# pr-review skill — deep review with auto-fix, exists in devx
|
||||
# pr-review skill — deep review with auto-fix, exists in repos with PR workflow
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestPrReviewSkill:
|
||||
def test_skill_exists(self) -> None:
|
||||
path = _DEVX / ".devin" / "skills" / "pr-review" / "SKILL.md"
|
||||
assert path.exists(), "pr-review SKILL.md not found in devx"
|
||||
REPOS_WITH_PR_WORKFLOW = ["infra", "grm", "sso-bridge", "devx"]
|
||||
|
||||
def test_mentions_all_review_categories(self) -> None:
|
||||
content = _read_skill("pr-review")
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_skill_exists(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "pr-review" / "SKILL.md"
|
||||
assert path.exists(), f"pr-review SKILL.md not found in {repo_name}"
|
||||
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_mentions_all_review_categories(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "pr-review" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
required_categories = [
|
||||
"Functional Correctness",
|
||||
"Completeness",
|
||||
@@ -243,31 +672,56 @@ class TestPrReviewSkill:
|
||||
"Test Quality",
|
||||
]
|
||||
for cat in required_categories:
|
||||
assert cat in content, f"pr-review skill missing category: {cat}"
|
||||
assert cat in content, f"pr-review skill in {repo_name} missing category: {cat}"
|
||||
|
||||
def test_mentions_auto_fix(self) -> None:
|
||||
content = _read_skill("pr-review")
|
||||
assert "auto-fix" in content.lower() or "auto fix" in content.lower(), "pr-review skill must mention auto-fix"
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_mentions_auto_fix(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "pr-review" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "auto-fix" in content.lower() or "auto fix" in content.lower(), (
|
||||
f"pr-review skill in {repo_name} must mention auto-fix"
|
||||
)
|
||||
|
||||
def test_mentions_gitea_mcp(self) -> None:
|
||||
content = _read_skill("pr-review")
|
||||
assert "mcp" in content.lower(), "pr-review skill must mention Gitea MCP"
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_mentions_gitea_mcp(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "pr-review" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "mcp" in content.lower(), f"pr-review skill in {repo_name} must mention Gitea MCP"
|
||||
|
||||
def test_mentions_inline_comments(self) -> None:
|
||||
content = _read_skill("pr-review")
|
||||
assert "inline" in content.lower(), "pr-review skill must mention inline comments"
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_mentions_inline_comments(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "pr-review" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "inline" in content.lower(), f"pr-review skill in {repo_name} must mention inline comments"
|
||||
|
||||
def test_mentions_ready_to_merge(self) -> None:
|
||||
content = _read_skill("pr-review")
|
||||
assert "ready-to-merge" in content, "pr-review skill must mention ready-to-merge label"
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_mentions_ready_to_merge(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "pr-review" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "ready-to-merge" in content, f"pr-review skill in {repo_name} must mention ready-to-merge label"
|
||||
|
||||
def test_mentions_resolve_discussion(self) -> None:
|
||||
content = _read_skill("pr-review")
|
||||
assert "resolve" in content.lower(), "pr-review skill must mention resolving discussions"
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_mentions_resolve_discussion(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "pr-review" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "resolve" in content.lower(), f"pr-review skill in {repo_name} must mention resolving discussions"
|
||||
|
||||
def test_mentions_summary(self) -> None:
|
||||
content = _read_skill("pr-review")
|
||||
assert "summary" in content.lower(), "pr-review skill must mention posting a summary"
|
||||
@pytest.mark.parametrize("repo_name", REPOS_WITH_PR_WORKFLOW)
|
||||
def test_mentions_summary(self, repo_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / "pr-review" / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "summary" in content.lower(), f"pr-review skill in {repo_name} must mention posting a summary"
|
||||
|
||||
def test_not_in_mattermost_oidc(self) -> None:
|
||||
"""mattermost-oidc has no PR workflow — should NOT have pr-review skill."""
|
||||
path = _OBLACHNO_ROOT / "mattermost-oidc" / ".devin" / "skills" / "pr-review" / "SKILL.md"
|
||||
assert not path.exists(), "mattermost-oidc should NOT have pr-review skill (no PR workflow)"
|
||||
|
||||
def test_no_pr_review_module_remains(self) -> None:
|
||||
"""The old devx.ci.pr_review module should be deleted."""
|
||||
@@ -280,78 +734,102 @@ class TestPrReviewSkill:
|
||||
assert not path.exists(), "tests/unit/test_pr_review.py should be deleted"
|
||||
|
||||
def test_no_pr_review_in_workflows(self) -> None:
|
||||
"""No devx CI workflow should reference devx.ci.pr_review."""
|
||||
wf_dir = _DEVX / ".gitea" / "workflows"
|
||||
if not wf_dir.exists():
|
||||
pytest.skip("No workflows directory")
|
||||
for wf_file in wf_dir.glob("*.yml"):
|
||||
content = wf_file.read_text(encoding="utf-8")
|
||||
assert "devx.ci.pr_review" not in content, f"{wf_file.name} still references devx.ci.pr_review"
|
||||
"""No CI workflow should reference devx.ci.pr_review."""
|
||||
for repo_name in ["infra", "grm", "sso-bridge", "devx"]:
|
||||
wf_dir = _OBLACHNO_ROOT / repo_name / ".gitea" / "workflows"
|
||||
if not wf_dir.exists():
|
||||
continue
|
||||
for wf_file in wf_dir.glob("*.yml"):
|
||||
content = wf_file.read_text(encoding="utf-8")
|
||||
assert "devx.ci.pr_review" not in content, (
|
||||
f"{repo_name}/{wf_file.name} still references devx.ci.pr_review"
|
||||
)
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Skill consistency — all devx skills have proper structure
|
||||
# Skill consistency — all skills have proper structure
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestSkillConsistency:
|
||||
DEVX_SKILLS = [
|
||||
"devx-workflow",
|
||||
"testing-and-debugging",
|
||||
"spec-driven-development",
|
||||
"pr-review",
|
||||
ALL_SKILLS = [
|
||||
("infra", "devx-workflow"),
|
||||
("infra", "testing-and-debugging"),
|
||||
("infra", "spec-driven-development"),
|
||||
("infra", "pr-review"),
|
||||
("grm", "devx-workflow"),
|
||||
("grm", "testing-and-debugging"),
|
||||
("grm", "spec-driven-development"),
|
||||
("grm", "pr-review"),
|
||||
("sso-bridge", "devx-workflow"),
|
||||
("sso-bridge", "testing-and-debugging"),
|
||||
("sso-bridge", "spec-driven-development"),
|
||||
("sso-bridge", "pr-review"),
|
||||
("devx", "devx-workflow"),
|
||||
("devx", "testing-and-debugging"),
|
||||
("devx", "spec-driven-development"),
|
||||
("devx", "pr-review"),
|
||||
("mattermost-oidc", "testing-and-debugging"),
|
||||
]
|
||||
|
||||
@pytest.mark.parametrize("skill_name", DEVX_SKILLS)
|
||||
def test_skill_has_title(self, skill_name: str) -> None:
|
||||
path = _DEVX / ".devin" / "skills" / skill_name / "SKILL.md"
|
||||
assert path.exists(), f"SKILL.md not found for {skill_name}"
|
||||
@pytest.mark.parametrize("repo_name, skill_name", ALL_SKILLS)
|
||||
def test_skill_has_title(self, repo_name: str, skill_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / skill_name / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
first_line = content.strip().split("\n")[0]
|
||||
assert first_line.startswith("# "), f"{skill_name}: SKILL.md must start with a # title"
|
||||
assert first_line.startswith("# "), f"{repo_name}/{skill_name}: SKILL.md must start with a # title"
|
||||
|
||||
@pytest.mark.parametrize("skill_name", DEVX_SKILLS)
|
||||
def test_skill_not_empty(self, skill_name: str) -> None:
|
||||
path = _DEVX / ".devin" / "skills" / skill_name / "SKILL.md"
|
||||
assert path.exists(), f"SKILL.md not found for {skill_name}"
|
||||
@pytest.mark.parametrize("repo_name, skill_name", ALL_SKILLS)
|
||||
def test_skill_not_empty(self, repo_name: str, skill_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / skill_name / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8").strip()
|
||||
assert len(content) > 100, f"{skill_name}: SKILL.md is too short ({len(content)} chars)"
|
||||
assert len(content) > 100, f"{repo_name}/{skill_name}: SKILL.md is too short ({len(content)} chars)"
|
||||
|
||||
@pytest.mark.parametrize("skill_name", DEVX_SKILLS)
|
||||
def test_skill_has_sections(self, skill_name: str) -> None:
|
||||
path = _DEVX / ".devin" / "skills" / skill_name / "SKILL.md"
|
||||
assert path.exists(), f"SKILL.md not found for {skill_name}"
|
||||
@pytest.mark.parametrize("repo_name, skill_name", ALL_SKILLS)
|
||||
def test_skill_has_sections(self, repo_name: str, skill_name: str) -> None:
|
||||
_skip_if_repo_missing(repo_name)
|
||||
path = _OBLACHNO_ROOT / repo_name / ".devin" / "skills" / skill_name / "SKILL.md"
|
||||
content = path.read_text(encoding="utf-8")
|
||||
# Must have at least 2 ## sections
|
||||
section_count = content.count("\n## ")
|
||||
assert section_count >= 2, f"{skill_name}: SKILL.md must have at least 2 sections (found {section_count})"
|
||||
assert section_count >= 2, (
|
||||
f"{repo_name}/{skill_name}: SKILL.md must have at least 2 sections (found {section_count})"
|
||||
)
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# AGENTS.md — spec-driven development section in devx
|
||||
# AGENTS.md — spec-driven development section in all repos
|
||||
# ============================================================================
|
||||
|
||||
|
||||
class TestAgentsMdSpecSection:
|
||||
def test_agents_md_has_spec_driven_section(self) -> None:
|
||||
path = _DEVX / "AGENTS.md"
|
||||
@pytest.mark.parametrize("repo_name", ["infra", "grm", "sso-bridge", "devx"])
|
||||
def test_agents_md_has_spec_driven_section(self, repo_name: str) -> None:
|
||||
path = _OBLACHNO_ROOT / repo_name / "AGENTS.md"
|
||||
if not path.exists():
|
||||
pytest.skip("AGENTS.md not found in devx")
|
||||
pytest.skip(f"AGENTS.md not found in {repo_name}")
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "## Spec-Driven Development" in content, "AGENTS.md must have '## Spec-Driven Development' section"
|
||||
|
||||
def test_agents_md_mentions_validate_spec(self) -> None:
|
||||
path = _DEVX / "AGENTS.md"
|
||||
if not path.exists():
|
||||
pytest.skip("AGENTS.md not found in devx")
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "validate_spec" in content or "devx.ci.validate_spec" in content, (
|
||||
"AGENTS.md must mention devx.ci.validate_spec"
|
||||
assert "## Spec-Driven Development" in content, (
|
||||
f"AGENTS.md in {repo_name} must have '## Spec-Driven Development' section"
|
||||
)
|
||||
|
||||
def test_agents_md_pr_workflow_section_intact(self) -> None:
|
||||
"""Ensure the PR Workflow section wasn't accidentally deleted."""
|
||||
path = _DEVX / "AGENTS.md"
|
||||
@pytest.mark.parametrize("repo_name", ["infra", "grm", "sso-bridge", "devx"])
|
||||
def test_agents_md_mentions_validate_spec(self, repo_name: str) -> None:
|
||||
path = _OBLACHNO_ROOT / repo_name / "AGENTS.md"
|
||||
if not path.exists():
|
||||
pytest.skip("AGENTS.md not found in devx")
|
||||
pytest.skip(f"AGENTS.md not found in {repo_name}")
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "## PR Workflow" in content, "AGENTS.md must still have '## PR Workflow' section"
|
||||
assert "validate_spec" in content or "devx.ci.validate_spec" in content, (
|
||||
f"AGENTS.md in {repo_name} must mention devx.ci.validate_spec"
|
||||
)
|
||||
|
||||
@pytest.mark.parametrize("repo_name", ["infra", "grm", "sso-bridge", "devx"])
|
||||
def test_agents_md_pr_workflow_section_intact(self, repo_name: str) -> None:
|
||||
"""Ensure the PR Workflow section wasn't accidentally deleted."""
|
||||
path = _OBLACHNO_ROOT / repo_name / "AGENTS.md"
|
||||
if not path.exists():
|
||||
pytest.skip(f"AGENTS.md not found in {repo_name}")
|
||||
content = path.read_text(encoding="utf-8")
|
||||
assert "## PR Workflow" in content, f"AGENTS.md in {repo_name} must still have '## PR Workflow' section"
|
||||
|
||||
Reference in New Issue
Block a user