From f67532d76b1d754a6a48ee6cdb72bc90d35eb082 Mon Sep 17 00:00:00 2001 From: kp2pml30 Date: Fri, 13 Nov 2026 02:24:18 +0900 Subject: [PATCH] =?UTF-8?q?feat(manager):=20ship=20only=20the=20dev=20netw?= =?UTF-8?q?ork=20and=20no=20default=20network=20=E2=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Production networks belong to their hosts, which pass their own schedule and network with `--chainforks-path` and `--default-network` - The shipped schedule keeps only `dev` - The shipped `default_network` is null, so a request naming no network is rejected unless the host passes one --- .../howto/extending/modify-runner.md | 15 +++++------ implementation/src/manager/chainforks_test.rs | 27 ++----------------- install/config/genvm-manager.yaml | 2 +- install/data/genvm-chainforks.json | 21 --------------- 4 files changed, 10 insertions(+), 55 deletions(-) diff --git a/docs/contributing/howto/extending/modify-runner.md b/docs/contributing/howto/extending/modify-runner.md index 7caaa294..37863e13 100644 --- a/docs/contributing/howto/extending/modify-runner.md +++ b/docs/contributing/howto/extending/modify-runner.md @@ -36,18 +36,17 @@ line's `data/all.json`: ### Adding a Fork The schedule is `install/data/genvm-chainforks.json` in the manager repo; a fork -named by a pin but missing there fails the build. A host with its own schedule -(Studio's) passes it as `genvm-manager --chainforks-path --default-network `, +named by a pin but missing there fails the build. It holds only `dev`: real +networks live in each host's own schedule (the node's, Studio's), which the host +passes as `genvm-manager --chainforks-path --default-network `, both for serving and for `check-install`. A flag left out falls back to the -config's `chainforks_path` or `default_network`. A null `default_network` -rejects a request naming no network +config's `chainforks_path` or `default_network`. The shipped `default_network` +is null, so a request naming no network is rejected unless the host passes one 1. Add the fork under `forks`, with `"requires": ["genvm/executor/"]`: a name extending another fork's name must require it -2. Schedule it on every network under `networks..forks`: `always` on - `dev`, so the test suite sees it, and `never` or the agreed RFC 3339 date on - the real networks. A network missing the fork fails the build and the - manager startup +2. Schedule it `always` on `dev`, so the test suite sees it. A network missing + the fork fails the build and the manager startup 3. Add the same fork to each host's schedule, scheduled on every network there (`never` or the agreed RFC 3339 date on the real ones), before the host moves to this release: the manager and `check-install` diff --git a/implementation/src/manager/chainforks_test.rs b/implementation/src/manager/chainforks_test.rs index 1cb9ffaa..28ec7721 100644 --- a/implementation/src/manager/chainforks_test.rs +++ b/implementation/src/manager/chainforks_test.rs @@ -35,36 +35,13 @@ fn the_shipped_schedule_is_valid() { ) .unwrap(); - assert_eq!( - schedule.networks.keys().collect::>(), - ["bradbury-phase2", "clarke", "dev", "phantom-bradbury"] - ); + // Real networks belong to the hosts, which pass their own schedules + assert_eq!(schedule.networks.keys().collect::>(), ["dev"]); let dev = schedule.active("dev", at("1970-01-01T00:00:00Z")).unwrap(); assert_eq!( dev.to_string(), "genvm/executor/v0.2,genvm/executor/v0.3,genvm/executor/v0.4" ); - let now = at("2026-11-09T00:00:00Z"); - assert_eq!( - schedule.active("clarke", now).unwrap().to_string(), - "genvm/executor/v0.4" - ); - for when in [at("1970-01-01T00:00:00Z"), at("2026-01-01T00:00:00Z"), now] { - assert_eq!( - schedule - .active("phantom-bradbury", when) - .unwrap() - .to_string(), - schedule - .active("bradbury-phase2", when) - .unwrap() - .to_string() - ); - } - assert!(!schedule - .active("bradbury-phase2", now) - .unwrap() - .contains("genvm/executor/v0.4")); } #[test] diff --git a/install/config/genvm-manager.yaml b/install/config/genvm-manager.yaml index 5e72ac4f..3b8abaeb 100644 --- a/install/config/genvm-manager.yaml +++ b/install/config/genvm-manager.yaml @@ -8,7 +8,7 @@ log_level: info manifest_path: ${exeDir}/../data/manifest.yaml chainforks_path: ${exeDir}/../data/genvm-chainforks.json # when each executor line and runner activates, per network -default_network: bradbury-phase2 # network of a request that names none +default_network: null # network of a request that names none; null rejects such a request allow_two_workers: true # overlap deterministic execution with nondeterministic validation permits: # 1 permit is 1 GiB of RAM total: null # if null, free memory times `per_gib` diff --git a/install/data/genvm-chainforks.json b/install/data/genvm-chainforks.json index f56254b4..085ec726 100644 --- a/install/data/genvm-chainforks.json +++ b/install/data/genvm-chainforks.json @@ -12,27 +12,6 @@ "genvm/executor/v0.3": "always", "genvm/executor/v0.4": "always" } - }, - "bradbury-phase2": { - "forks": { - "genvm/executor/v0.2": "never", - "genvm/executor/v0.3": "always", - "genvm/executor/v0.4": "never" - } - }, - "phantom-bradbury": { - "forks": { - "genvm/executor/v0.2": "never", - "genvm/executor/v0.3": "always", - "genvm/executor/v0.4": "never" - } - }, - "clarke": { - "forks": { - "genvm/executor/v0.2": "never", - "genvm/executor/v0.3": "never", - "genvm/executor/v0.4": "always" - } } } }