Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion docs/demo/20_core_install_mac_studio.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

**Jump:** [English](#english) · [日本語](#japanese)

- Version / 版: 0.28 — 2026-11-16. **Learned:** a pin can be proven before the merge exists: GitHub's test merge of osf.io #41 (`022de5cf`) was deployed and accepted (16 passed), and the merge commit `567a03ee` carries the same tree, so the run stands for the pin. / 固定版は、マージができる前に証明できる。GitHub が作った osf.io #41 の試しのマージ(`022de5cf`)を配備して受入(合格 16)を通し、マージコミット `567a03ee` は同じ tree を持つので、その実行が固定版の証拠になる。
- Version / 版: 0.29 — 2026-11-17. **Learned:** a tree that was proven under one SHA has no image under the SHA that is pinned: the run on osf.io #44's test merge `c09e4687cd2a` stands for the merge commit `01999360e094` (same tree), but `up` on a pin needs the image tagged with that pin, and switching back to develop's `567a03ee` failed with exit 40 until that tag was built (from cache). / ある SHA で証明した tree でも、固定した SHA のタグのイメージは別にある。osf.io #44 の試しのマージ `c09e4687cd2a` での実行はマージコミット `01999360e094`(同じ tree)の証拠になるが、固定版で `up` するにはその固定版のタグのイメージが要る。develop の `567a03ee` に戻すときは、そのタグを(キャッシュから)組むまで exit 40 で失敗した。
0.28 — 2026-11-16. **Learned:** a pin can be proven before the merge exists: GitHub's test merge of osf.io #41 (`022de5cf`) was deployed and accepted (16 passed), and the merge commit `567a03ee` carries the same tree, so the run stands for the pin. / 固定版は、マージができる前に証明できる。GitHub が作った osf.io #41 の試しのマージ(`022de5cf`)を配備して受入(合格 16)を通し、マージコミット `567a03ee` は同じ tree を持つので、その実行が固定版の証拠になる。
0.27 — 2026-11-16. **Learned:** an allow-list entry is only as necessary as the package behind it: MFR without pspp (RDM-modular-file-renderer-dev2027 PR #8 head `7a554e2`) has 87 Debian packages instead of 193, Trivy finds 0 CRITICAL / 47 HIGH instead of 3 / 127, 36 of the 47 MFR entries match nothing and were deleted, and acceptance still passed 16 with 8 skips (run `acc-20261116T070123Z-1e2c03`). / 許容リストの項目は、その後ろのパッケージが要る間だけ要る。pspp を外した MFR(RDM-modular-file-renderer-dev2027 PR #8 の先頭 `7a554e2`)は Debian のパッケージが 193 個から 87 個になり、Trivy の検出は CRITICAL/HIGH 3 / 127 から 0 / 47 になった。MFR の 47 項目のうち 36 項目は何にも当てはまらなくなったので削除し、受入はそれでも合格 16、スキップ 8 だった(実行 `acc-20261116T070123Z-1e2c03`)。
0.26 — 2026-11-16. **Learned:** a security fix upstream is worth a pin of its own before the next one lands: osf.io `c5a05de0e3d0` (#39, READ users can no longer timestamp or cancel others' tasks; #40, tests) passed 16 with 8 skips in the core profile, run `acc-20261116T003758Z-d077f9`, without waiting for #41. / 上流のセキュリティ修正は、次の修正を待たずに専用の固定版に値する。osf.io `c5a05de0e3d0`(#39 は READ の利用者がタイムスタンプの付与やほかの人の処理の取消をできないように、#40 は試験)は、#41 を待たずに core で合格 16、スキップ 8 だった(実行 `acc-20261116T003758Z-d077f9`)。
0.25 — 2026-11-15. **Learned:** with `compose render` placed between `build` and `up`, a pin bump is one pass: the first `up` recreated web, api, admin, worker, osf_init and wiki_assets on osf.io `07cc56d47b39` (RDM-osf.io-dev2027 `develop` after #34, #35, #36, #38), and acceptance passed 16 with 8 skips (S2 to S5), run `acc-20261115T133503Z-a3fa08`. / `build` と `up` の間に `compose render` を置けば、固定版の更新は一回で済む。最初の `up` で web・api・admin・worker・osf_init・wiki_assets が osf.io `07cc56d47b39`(#34・#35・#36・#38 のマージ後の RDM-osf.io-dev2027 `develop`)で作り直され、受入は合格 16、スキップ 8(S2〜S5)だった(実行 `acc-20261115T133503Z-a3fa08`)。
Expand Down Expand Up @@ -769,6 +770,21 @@ steps[5]{step,exit,result}:

An earlier attempt the same evening (run `acc-20261116T105442Z-124046`) is void: the MFR image of develop's new pin had not been built, `up` failed on the image pull, and the acceptance then ran against the old containers. The script now runs `accept` only after `up` and `health` succeed. Not shown here: the cancel path of a real Celery worker, which no scenario covers; it rests on the osf.io tests.

### Pin update — 2026-11-16 (UTC), osf.io `01999360e094` (#44), 18 passed

RDM-osf.io-dev2027 #44 (part of issue #42: a wiki import's cancel never reached the worker, because the task id was handed to `abort()` as a one-element tuple; the cancel now stops a running import, and a task whose Celery result is SUCCESS or FAILURE counts as ended; `addons/wiki/views.py` and its tests, no settings, migration or dependency change) merged into `develop` as `01999360e09403758dfe5d0c2609fa67a33ef254` (parents `567a03ee` and `311cdf49`). Before the merge, at the request of the osf.io owner session, GitHub's test merge `c09e4687cd2a5b144f9c84ee35ba08ab96ecad6d` was deployed on the Mac Studio stack, on guide `develop` `11c8fe1` (with #97's C5 checks of the API v2 `links.render`). Its tree `f82579415189dc6dec1583c9499fae62ed7fc7ea` equals the tree of `01999360` (checked through the API), so the run below stands for this pin. The PR's CI on the head passed 9 of 9; the push CI of `01999360` was running when this was written.

```toon
steps[5]{step,exit,result}:
"build --component modular-file-renderer / osf.io / wiki-frontend",0,"23:10:04Z to 23:11:28Z; MFR f2ec516c6cbd from cache, osf.io 65 s"
"compose render --profile core --auth fakecas",0,"the manifest's osf.io pin replaced by c09e4687 for the run only"
"up",0,"76 s; osf_init, wiki_assets, web, api, admin and worker recreated on the new tags"
"health --network",0,"23 services, loopback only"
"accept --seed",0,"run acc-20261116T231247Z-a23bc0, 111 s: 18 passed (C1 to C7 and S1, with #97's two C5 links.render cases), 0 failed, 9 skipped"
```

Switching back to develop's pin `567a03ee` then failed at `up` with exit 40: no image had been built under that tag, because #41 had been proven on its test merge `022de5cf`. Building osf.io and wiki-frontend at `567a03ee` (from cache, 5 s and 10 s) fixed it, and render, `up` and `health --network` on develop then exited 0. Not shown here: the cancel path of a real Celery worker, which no scenario covers; it rests on the osf.io tests.

---

<a id="japanese"></a>
Expand Down Expand Up @@ -1502,6 +1518,21 @@ steps[5]{step,exit,result}:

同じ夜のそれより前の試行(実行 `acc-20261116T105442Z-124046`)は無効である。develop の新しい固定版の MFR のイメージを組んでいなかったため `up` がイメージの取得で失敗し、受入は古いコンテナのまま流れた。スクリプトは今、`up` と `health` が成功したときだけ `accept` を流す。ここで示さないこと: 本物の Celery の worker の取消経路はどのシナリオも扱っておらず、osf.io の試験に拠る。

### 固定版の更新 — 2026-11-16(UTC)、osf.io `01999360e094`(#44)、合格 18

RDM-osf.io-dev2027 #44(issue #42 の一部。Wiki の取り込みの取消が worker に届いていなかった。task id を 1 要素のタプルとして `abort()` に渡していたためである。動いている取り込みが取消で止まるようになり、Celery の結果が SUCCESS か FAILURE のタスクも終わったものと数える。`addons/wiki/views.py` とその試験だけで、設定・migration・依存の変更はない)は、`develop` に `01999360e09403758dfe5d0c2609fa67a33ef254` としてマージされた(親は `567a03ee` と `311cdf49`)。マージの前に、osf.io の担当のセッションの依頼で、GitHub の試しのマージ `c09e4687cd2a5b144f9c84ee35ba08ab96ecad6d` を Mac Studio のスタックに配備した。ガイドは `develop` の `11c8fe1`(#97 の C5 の API v2 `links.render` の確認を含む)である。その tree `f82579415189dc6dec1583c9499fae62ed7fc7ea` は `01999360` の tree と同じ(API で確認)なので、下の実行がこの固定版の証拠になる。head での PR の CI は 9 件中 9 件が合格。執筆時点で `01999360` の push の CI は実行中だった。

```toon
steps[5]{step,exit,result}:
"build --component modular-file-renderer / osf.io / wiki-frontend",0,"23:10:04Z〜23:11:28Z。MFR f2ec516c6cbd はキャッシュ、osf.io は 65 秒"
"compose render --profile core --auth fakecas",0,"manifest の osf.io の固定版を実行の間だけ c09e4687 にした"
"up",0,"76 秒。osf_init・wiki_assets・web・api・admin・worker が新しいタグで作り直された"
"health --network",0,"23 サービス、ループバックのみ"
"accept --seed",0,"実行 acc-20261116T231247Z-a23bc0、111 秒: 合格 18(C1〜C7 と S1。#97 の C5 links.render の 2 件を含む)、失敗 0、スキップ 9"
```

そのあと develop の固定版 `567a03ee` に戻す `up` は exit 40 で失敗した。#41 は試しのマージ `022de5cf` で証明したので、そのタグのイメージを組んでいなかった。`567a03ee` で osf.io と wiki-frontend を(キャッシュから 5 秒と 10 秒で)組むと直り、develop での render・`up`・`health --network` は終了 0 だった。ここで示さないこと: 本物の Celery の worker の取消経路はどのシナリオも扱っておらず、osf.io の試験に拠る。

---

## Glossary / 用語
Expand Down
299 changes: 299 additions & 0 deletions docs/demo/runs/acc-20261116T231247Z-a23bc0/collector.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,299 @@
[
{
"nodeid": "test_c1_login.py::test_c1_login_success[chromium]",
"id": "C1",
"name": "Login via fakecas",
"case": "success",
"status": "passed",
"duration_ms": 2065,
"http_status": 200,
"evidence": null,
"known_external_blocked": 7
},
{
"nodeid": "test_c2_create_project.py::test_c2_create_project_success[chromium]",
"id": "C2",
"name": "Create project",
"case": "success",
"status": "passed",
"duration_ms": 4714,
"http_status": 200,
"evidence": null,
"known_external_blocked": 14
},
{
"nodeid": "test_c2_create_project.py::test_c2_create_project_rejection[chromium]",
"id": "C2",
"name": "Create project",
"case": "rejection",
"status": "passed",
"duration_ms": 3941,
"http_status": 403,
"evidence": null,
"known_external_blocked": 8
},
{
"nodeid": "test_c3_file_upload.py::test_c3_file_upload_success[chromium]",
"id": "C3",
"name": "Upload and download file",
"case": "success",
"status": "passed",
"duration_ms": 2998,
"http_status": 200,
"evidence": null,
"known_external_blocked": 4
},
{
"nodeid": "test_c3_file_upload.py::test_c3_file_upload_rejection[chromium]",
"id": "C3",
"name": "Upload and download file",
"case": "rejection",
"status": "passed",
"duration_ms": 4247,
"http_status": 403,
"evidence": null,
"known_external_blocked": 8
},
{
"nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_success[chromium]",
"id": "C4",
"name": "Wiki collaborative edit",
"case": "success",
"status": "passed",
"duration_ms": 7678,
"http_status": 200,
"evidence": null,
"known_external_blocked": 18
},
{
"nodeid": "test_c4_wiki_collab.py::test_c4_wiki_collab_rejection[chromium]",
"id": "C4",
"name": "Wiki collaborative edit",
"case": "rejection",
"status": "passed",
"duration_ms": 4351,
"http_status": 4401,
"evidence": null,
"known_external_blocked": 13
},
{
"nodeid": "test_c5_file_preview.py::test_c5_file_preview_success[chromium]",
"id": "C5",
"name": "File preview",
"case": "success",
"status": "passed",
"duration_ms": 4519,
"http_status": 200,
"evidence": null,
"known_external_blocked": 9
},
{
"nodeid": "test_c5_file_preview.py::test_c5_file_preview_rejection[chromium]",
"id": "C5",
"name": "File preview",
"case": "rejection",
"status": "passed",
"duration_ms": 5206,
"http_status": 401,
"evidence": null,
"known_external_blocked": 9
},
{
"nodeid": "test_c5_file_preview.py::test_c5_api_render_link_success[chromium]",
"id": "C5",
"name": "File preview",
"case": "success",
"status": "passed",
"duration_ms": 4398,
"http_status": 200,
"evidence": null,
"known_external_blocked": 4
},
{
"nodeid": "test_c5_file_preview.py::test_c5_api_render_link_rejection[chromium]",
"id": "C5",
"name": "File preview",
"case": "rejection",
"status": "passed",
"duration_ms": 3006,
"http_status": 401,
"evidence": null,
"known_external_blocked": 4
},
{
"nodeid": "test_c6_admin.py::test_c6_admin_success[chromium]",
"id": "C6",
"name": "Institution admin screen",
"case": "success",
"status": "passed",
"duration_ms": 1844,
"http_status": 200,
"evidence": null,
"known_external_blocked": 6
},
{
"nodeid": "test_c6_admin.py::test_c6_admin_rejection[chromium]",
"id": "C6",
"name": "Institution admin screen",
"case": "rejection",
"status": "passed",
"duration_ms": 707,
"http_status": 403,
"evidence": null,
"known_external_blocked": 3
},
{
"nodeid": "test_c7_file_editor.py::test_c7_file_editor_success[chromium]",
"id": "C7",
"name": "File page collaborative edit",
"case": "success",
"status": "passed",
"duration_ms": 8996,
"http_status": 200,
"evidence": null,
"known_external_blocked": 20
},
{
"nodeid": "test_c7_file_editor.py::test_c7_file_editor_rejection[chromium]",
"id": "C7",
"name": "File page collaborative edit",
"case": "rejection",
"status": "passed",
"duration_ms": 6317,
"http_status": 4401,
"evidence": null,
"known_external_blocked": 17
},
{
"nodeid": "test_s1_y_websocket.py::test_s1_y_websocket_success[chromium]",
"id": "S1",
"name": "y-websocket",
"case": "success",
"status": "passed",
"duration_ms": 8692,
"http_status": 200,
"evidence": null,
"known_external_blocked": 22
},
{
"nodeid": "test_s1_y_websocket.py::test_s1_y_websocket_rejection[chromium]",
"id": "S1",
"name": "y-websocket",
"case": "rejection",
"status": "passed",
"duration_ms": 3758,
"http_status": 4401,
"evidence": null,
"known_external_blocked": 9
},
{
"nodeid": "test_s2_rdmcp.py::test_s2_rdmcp_success[chromium]",
"id": "S2",
"name": "rdmcp (MCP endpoint)",
"case": "success",
"status": "skipped",
"duration_ms": 2098,
"http_status": null,
"evidence": null,
"known_external_blocked": 4
},
{
"nodeid": "test_s2_rdmcp.py::test_s2_rdmcp_rejection[chromium]",
"id": "S2",
"name": "rdmcp (MCP endpoint)",
"case": "rejection",
"status": "skipped",
"duration_ms": 3128,
"http_status": null,
"evidence": null,
"known_external_blocked": 8
},
{
"nodeid": "test_s3_aipf.py::test_s3_aipf_success[chromium]",
"id": "S3",
"name": "aipf_mcp_data_grdm",
"case": "success",
"status": "skipped",
"duration_ms": 0,
"http_status": null,
"evidence": null,
"known_external_blocked": 0
},
{
"nodeid": "test_s3_aipf.py::test_s3_aipf_rejection[chromium]",
"id": "S3",
"name": "aipf_mcp_data_grdm",
"case": "rejection",
"status": "skipped",
"duration_ms": 0,
"http_status": null,
"evidence": null,
"known_external_blocked": 0
},
{
"nodeid": "test_s4_oasys.py::test_s4_oasys_success[chromium]",
"id": "S4",
"name": "OASys",
"case": "success",
"status": "skipped",
"duration_ms": 2201,
"http_status": null,
"evidence": null,
"known_external_blocked": 4
},
{
"nodeid": "test_s4_oasys.py::test_s4_oasys_rejection[chromium]",
"id": "S4",
"name": "OASys",
"case": "rejection",
"status": "skipped",
"duration_ms": 2229,
"http_status": null,
"evidence": null,
"known_external_blocked": 4
},
{
"nodeid": "test_s5_shibboleth.py::test_s5_shibboleth_success[chromium]",
"id": "S5",
"name": "Shibboleth-SP via test IdP",
"case": "success",
"status": "skipped",
"duration_ms": 57,
"http_status": null,
"evidence": null,
"known_external_blocked": 0
},
{
"nodeid": "test_s5_shibboleth.py::test_s5_shibboleth_rejection[chromium]",
"id": "S5",
"name": "Shibboleth-SP via test IdP",
"case": "rejection",
"status": "skipped",
"duration_ms": 0,
"http_status": null,
"evidence": null,
"known_external_blocked": 0
},
{
"nodeid": "test_s5_shibboleth.py::test_s5_cas_direct_forgery_rejection[chromium]",
"id": "S5",
"name": "Shibboleth-SP via test IdP",
"case": "rejection",
"status": "skipped",
"duration_ms": 0,
"http_status": null,
"evidence": null,
"known_external_blocked": 0
},
{
"nodeid": "test_c1_login.py::test_c1_login_rejection",
"id": "C1",
"name": "Login via fakecas",
"case": "rejection",
"status": "passed",
"duration_ms": 69,
"http_status": 401,
"evidence": null,
"known_external_blocked": 0
}
]
Loading
Loading