Mechanical, semantics-preserving cleanup so the codebase passes the new lint stage:
- ruff format: all 32 Python files (wraps long signatures, normalizes quotes/blank lines).
- nixpkgs-fmt: modules/drone-runner.nix.
- shfmt (-i 2 -ci): scripts/*.sh.
Lint fixes (reviewed, behavior-preserving — no test weakened):
- ruff SIM105: try/except-pass -> contextlib.suppress (abra.py app_config rm; lifecycle.py janitor).
- ruff SIM115: open().read() -> with open() (run_recipe_ci.py redaction-values + gitea-token).
- statix: merge repeated sops `secrets.*` keys into one `secrets = { ... }` (comments kept);
empty fn pattern `{ ... }:` -> `_:` (packages.nix).
- deadnix: drop unused lambda args (flake `self`; configuration.nix `lib`; overlay `final` -> `_`).
Verified on cc-ci: `scripts/lint.sh` -> lint: PASS; nixosConfigurations.cc-ci evaluates;
all Python byte-compiles. The deployed bridge/dashboard/runner source changes hash (reformat),
so cc-ci will be rebuilt to the new closure in W2 before the cold D1-D10 re-verification.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
64 lines
2.3 KiB
Python
64 lines
2.3 KiB
Python
"""matrix-synapse — upgrade stage (D2): deploy the previous published version, write a DB marker,
|
|
upgrade to current/$REF, assert the app stays healthy and the postgres data survives.
|
|
|
|
Matrix data lives in postgres, so the marker is a row in a dedicated `ci_marker` table (synapse's
|
|
own schema migrations don't touch it), read back via `psql` in the `db` service."""
|
|
|
|
import os
|
|
import sys
|
|
|
|
import pytest
|
|
|
|
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "runner"))
|
|
from harness import lifecycle # noqa: E402
|
|
|
|
|
|
def _psql(domain, sql):
|
|
cmd = f'PGPASSWORD=$(cat /run/secrets/db_password) psql -U synapse -d synapse -tAc "{sql}"'
|
|
return lifecycle.exec_in_app(domain, ["sh", "-c", cmd], service="db").strip()
|
|
|
|
|
|
@pytest.fixture
|
|
def old_app(recipe, app_domain, meta, request):
|
|
prev = lifecycle.previous_version(recipe)
|
|
if not prev:
|
|
pytest.skip(f"{recipe}: no previous published version to upgrade from")
|
|
lifecycle.janitor()
|
|
request.addfinalizer(lambda: lifecycle.teardown_app(app_domain))
|
|
lifecycle.deploy_app(recipe, app_domain, version=prev)
|
|
lifecycle.wait_healthy(
|
|
app_domain,
|
|
ok_codes=tuple(meta["HEALTH_OK"]),
|
|
path=meta["HEALTH_PATH"],
|
|
deploy_timeout=meta["DEPLOY_TIMEOUT"],
|
|
http_timeout=meta["HTTP_TIMEOUT"],
|
|
)
|
|
return app_domain, prev
|
|
|
|
|
|
def test_upgrade_preserves_data(old_app, meta):
|
|
domain, prev = old_app
|
|
# write a marker row into postgres (independent of synapse's own tables)
|
|
_psql(
|
|
domain,
|
|
"CREATE TABLE IF NOT EXISTS ci_marker(v text); DELETE FROM ci_marker; "
|
|
"INSERT INTO ci_marker VALUES('upgrade-survives');",
|
|
)
|
|
assert _psql(domain, "SELECT v FROM ci_marker;") == "upgrade-survives"
|
|
|
|
# upgrade previous -> current/$REF
|
|
lifecycle.upgrade_app(domain, version=os.environ.get("VERSION") or None)
|
|
lifecycle.wait_healthy(
|
|
domain,
|
|
ok_codes=tuple(meta["HEALTH_OK"]),
|
|
path=meta["HEALTH_PATH"],
|
|
deploy_timeout=meta["DEPLOY_TIMEOUT"],
|
|
http_timeout=meta["HTTP_TIMEOUT"],
|
|
)
|
|
|
|
# app healthy and the data written before the upgrade is still there
|
|
assert lifecycle.http_get(domain, meta["HEALTH_PATH"]) == 200
|
|
assert (
|
|
_psql(domain, "SELECT v FROM ci_marker;") == "upgrade-survives"
|
|
), "postgres data did not survive the upgrade"
|