wip

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

Justfile

@@ -112,9 +112,23 @@ mdbook-serve: build-mdbook
 #
 # This is the unified command that:
 # - Auto-discovers new CLI commands and creates man page templates
-# - Syncs CLI options from Rust code to existing man page templates  
+# - Syncs CLI options from Rust code to existing man page templates
 # - Updates JSON schema files
 #
 # Use this after adding, removing, or modifying CLI options or schemas.
 update-generated:
     cargo run -p xtask update-generated
+
+# Fast development loop: Build and deploy to a persistent bcvk VM
+#
+# On first run: Creates a VM named "bootc-dev" from the built image
+# On subsequent runs: Upgrades the VM to the newly built image and reboots
+#
+# This enables a fast edit-compile-debug cycle:
+#   just build bcvk-up -> edit code -> just build bcvk-up -> just bcvk-ssh
+bcvk-up: build
+    cargo xtask bcvk-up localhost/bootc
+
+# SSH into the bootc-dev VM
+bcvk-ssh:
+    bcvk libvirt ssh bootc-dev

crates/xtask/src/xtask.rs

@@ -58,6 +58,8 @@ enum Commands {
     RunTmt(RunTmtArgs),
     /// Provision a VM for manual TMT testing
     TmtProvision(TmtProvisionArgs),
+    /// Create or upgrade a persistent development VM
+    BcvkUp(BcvkUpArgs),
 }
 
 /// Arguments for run-tmt command
@@ -94,6 +96,17 @@ struct TmtProvisionArgs {
     vm_name: Option<String>,
 }
 
+/// Arguments for bcvk-up command
+#[derive(Debug, Args)]
+struct BcvkUpArgs {
+    /// Image name (e.g., "localhost/bootc")
+    image: String,
+
+    /// VM name (defaults to "bootc-dev")
+    #[arg(long, default_value = "bootc-dev")]
+    vm_name: String,
+}
+
 fn main() {
     use std::io::Write as _;
 
@@ -138,6 +151,7 @@ fn try_main() -> Result<()> {
         Commands::Spec => spec(&sh),
         Commands::RunTmt(args) => run_tmt(&sh, &args),
         Commands::TmtProvision(args) => tmt_provision(&sh, &args),
+        Commands::BcvkUp(args) => bcvk_up(&sh, &args),
     }
 }
 
@@ -876,3 +890,43 @@ fn tmt_provision(sh: &Shell, args: &TmtProvisionArgs) -> Result<()> {
 
     Ok(())
 }
+
+/// Create or upgrade a persistent development VM
+/// On first run, creates a new VM. On subsequent runs, upgrades and reboots.
+#[context("Managing development VM")]
+fn bcvk_up(sh: &Shell, args: &BcvkUpArgs) -> Result<()> {
+    let vm_name = &args.vm_name;
+    let image = &args.image;
+
+    // Check if VM exists by listing all VMs
+    let list_output = cmd!(sh, "bcvk libvirt list --format=json").read()?;
+    let vms: Vec<serde_json::Value> =
+        serde_json::from_str(&list_output).context("Parsing bcvk list output")?;
+    let vm_exists = vms.iter().any(|vm| {
+        vm.get("name")
+            .and_then(|n| n.as_str())
+            .map(|n| n == vm_name)
+            .unwrap_or(false)
+    });
+
+    if vm_exists {
+        println!("VM '{}' exists, upgrading to new image...", vm_name);
+
+        // Run bootc upgrade with error checking
+        println!("Running bootc upgrade...");
+        cmd!(sh, "bcvk libvirt ssh {vm_name} -- bootc upgrade")
+            .run()
+            .context("Failed to upgrade bootc")?;
+
+        // Now reboot (this will drop the connection, so ignore the error)
+        println!("Rebooting VM...");
+        cmd!(sh, "bcvk libvirt ssh {vm_name} -- systemctl reboot")
+            .ignore_stderr()
+            .ignore_status()
+            .run()?;
+    } else {
+        cmd!(sh, "bcvk libvirt run --bind-storage-ro --name {vm_name} {image}").run()?;
+        println!("Connect with: just bcvk-ssh");
+    }
+    Ok(())
+}