diff --git a/internal/bootstrap/builder_test.go b/internal/bootstrap/builder_test.go index 4286782..eb109a2 100644 --- a/internal/bootstrap/builder_test.go +++ b/internal/bootstrap/builder_test.go @@ -150,7 +150,7 @@ func TestAForgeManifestTheCatalogueDoesNotHaveIsNamed(t *testing.T) { // theCataloguesModule is a module's own manifest, never a copy: the clone beside a merge check (MESH_CHECK_BESIDE), where it // must be; else a checkout beside this one; else the test skips aloud. The catalogue holds it, but for the build agent, -// which moved whole into the controller's repository (ADR 0420, issue 1019, issue 1151) and is read from there. +// which moved whole into the controller's repository (ADR 0420, issue 1019, issue 1151) and was read from there. // // **The build agent is not there any more** (R4g, ADR 0524 section 5): the group deletes it from the controller with the seat // node-build-agent. Genesis still installs it as a new mesh's builder, and where genesis gets a builder instead is issue @@ -163,9 +163,6 @@ func theCataloguesModule(t *testing.T, module string) []byte { "a new mesh cannot raise a builder until issue 1152 gives genesis one, and this test is judged again with it") } repository := "mesh-catalog" - if module == BuilderModule { - repository = "mesh-controller" - } inside := filepath.Join(repository, "modules", module, "module.json") if root := os.Getenv("MESH_CHECK_BESIDE"); root != "" { raw, err := os.ReadFile(filepath.Join(root, inside)) diff --git a/internal/bootstrap/genesis_toolchains_test.go b/internal/bootstrap/genesis_toolchains_test.go index 8523054..cfae225 100644 --- a/internal/bootstrap/genesis_toolchains_test.go +++ b/internal/bootstrap/genesis_toolchains_test.go @@ -26,6 +26,11 @@ func TestTheBaseStepBuildsEveryToolchainAGenesisModuleIsCompiledIn(t *testing.T) built[tc.Language] = true } for _, module := range genesisModules { + if module == BuilderModule { + t.Logf("NOT JUDGED: genesis still installs build-agent, which left mesh-controller with R4g (ADR 0524 section 5); " + + "only build-agent is set aside here until issue 1152 gives genesis a builder, the other modules are judged") + continue + } var m struct { Build struct { Artifacts []struct {