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
9 changes: 2 additions & 7 deletions dag/gunbc/fleet_converge_emit.dag
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,6 @@ data fleet_converge_steady_state_doc_projection_dissolution_trigger: Disposition
}
}

data fleet_converge_fresh_standup_bootstrap_emit_dissolution_trigger: Disposition = Scaffold {
dissolves_to: RealizationDispatch,
bind: DeclarationRef {
module_path: "gunbc.fleet_converge_emit",
decl_name: "fresh_standup_bootstrap_intent",
field: WholeDeclaration
}
data fleet_converge_fresh_standup_bootstrap_emit_dissolution_trigger: Disposition = Terminal {
reason: "fresh-standup bootstrap routes through orch_emit_pipeline(intent,Bash) on fresh_standup_bootstrap_intent; witness_fresh_standup_bootstrap_committed_byte_oracle_holds in fleet_converge_emit_test.dag byte-oracles the arm+thin-run seam vs .github/fleet-converge.sh (shell→dag P2 consumer slice, #6573/#6585)"
}
11 changes: 3 additions & 8 deletions dag/gunbc/host_effect.dag
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,11 @@ type HostEffectTransport =
| EmitArtifactThenThinRun { bootstrap: BootstrapFragment, invocation: ThinInvocation }

data host_effect_emit_artifact_transport_scope_disposition: Disposition = Terminal {
reason: "EmitArtifactThenThinRun transport mint (shell-emission slice 1+2): BootstrapFragment.script and ThinInvocation.argv are medium-as-string scaffolds until bash-emit (#5828) routes fresh-standup bootstrap through emit(intent,Bash) and steady-state thin-run through typed argv dispatch; carrier scaffolds bind the dissolution rows below."
reason: "EmitArtifactThenThinRun transport mint (shell-emission slice 1+2): fresh-standup bootstrap routes through emit(intent,Bash) (bootstrap_fragment_script_carrier_scaffold dissolved); ThinInvocation.argv remains a medium-as-string scaffold until steady-state typed argv dispatch dissolves thin_invocation_argv_carrier_scaffold."
}

data bootstrap_fragment_script_carrier_scaffold: Disposition = Scaffold {
dissolves_to: RealizationDispatch,
bind: DeclarationRef {
module_path: "gunbc.fleet_converge_emit",
decl_name: "fleet_converge_fresh_standup_bootstrap_emit_dissolution_trigger",
field: WholeDeclaration,
}
data bootstrap_fragment_script_carrier_scaffold: Disposition = Terminal {
reason: "fresh-standup bootstrap emits through orch_emit_pipeline(intent,Bash) on fresh_standup_bootstrap_intent; BootstrapFragment.script is no longer a hand-spelled concat surface for the fleet-converge bootstrap arm (fleet_converge_fresh_standup_bootstrap_emit_dissolution_trigger dissolved)"
}

data thin_invocation_argv_carrier_scaffold: Disposition = Scaffold {
Expand Down
9 changes: 2 additions & 7 deletions dag/test/claim/fleet_converge_apply_witness_test.dag
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,8 @@ fn witness_thin_invocation_argv() -> Bool {

fn witness_emit_artifact_carriers_name_bash_emit_scaffolds() -> Bool {
match bootstrap_fragment_script_carrier_scaffold {
Scaffold {
dissolves_to: RealizationDispatch,
bind: DeclarationRef { module_path: m, decl_name: d, field: WholeDeclaration },
} =>
m == "gunbc.fleet_converge_emit"
&& d == "fleet_converge_fresh_standup_bootstrap_emit_dissolution_trigger"
_ => false
Terminal { reason: _ } => true
Scaffold { dissolves_to: _, bind: _ } => false
}
&& match thin_invocation_argv_carrier_scaffold {
Scaffold {
Expand Down
14 changes: 12 additions & 2 deletions dag/test/claim/fleet_converge_emit_test.dag
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,15 @@ fn witness_gunbc_pinned_tree_runs_first() -> Bool {
}
}

fn witness_fresh_standup_bootstrap_committed_byte_oracle_holds() -> Bool {
let committed = filesystem_read(path: ".github/fleet-converge.sh").content
let arm = fresh_standup_bootstrap_arm_golden()
let seam = concat(concat(arm, "\n"), "gunbc converge --host \"srv3\" || host_failed=1")
has(s: committed, p: seam)
&& !has(s: committed, p: concat(seam, "x"))
&& !has(s: fresh_standup_bootstrap_script(), p: fresh_standup_bootstrap_emit_refused_poison)
}

fn witness_fresh_standup_bootstrap_emit_bytes_hold() -> Bool {
let sh = expected_fleet_converge_sh()
has(s: sh, p: fresh_standup_bootstrap_arm_golden())
Expand All @@ -164,6 +173,7 @@ fn witness_fresh_standup_bootstrap_emit_bytes_hold() -> Bool {
&& has(s: sh, p: gunbc_host_gunbc_root_path)
&& has(s: sh, p: "cargo build -p v1-compiler --release --bin gunbc")
&& !has(s: sh, p: fresh_standup_bootstrap_emit_refused_poison)
&& witness_fresh_standup_bootstrap_committed_byte_oracle_holds()
}

fn witness_fresh_standup_bootstrap_arm_perturb_red() -> Bool {
Expand All @@ -173,8 +183,8 @@ fn witness_fresh_standup_bootstrap_arm_perturb_red() -> Bool {

fn witness_fresh_standup_bootstrap_emit_dissolution_scaffold() -> Bool {
match fleet_converge_fresh_standup_bootstrap_emit_dissolution_trigger {
Scaffold { dissolves_to: _, bind: _ } => true
Terminal { reason: _ } => false
Terminal { reason: _ } => true
Scaffold { dissolves_to: _, bind: _ } => false
}
}

Expand Down
Loading