refactor: rename "bare metal" to "native host" across codebase (#236)

The "bare metal" terminology was misleading since the deployment mode
works equally well on VMs. "Native host" accurately conveys running
directly on the host OS regardless of whether it's physical or virtual.

Renames directories, modules, enum variants, struct names, config keys,
CI workflow references, and documentation.

Author: shiv-tyagi

.github/workflows/e2e.yml

@@ -62,15 +62,15 @@ jobs:
               });
             }
 
-  bare-metal:
-    name: Bare-Metal
+  native-host:
+    name: Native-Host
     runs-on: [self-hosted, amd-aac02-rocm]
     if: github.event.workflow_run.conclusion == 'success'
     concurrency:
-      group: bare-metal-cluster
+      group: native-host-cluster
       queue: max
     env:
-      STATUS_CONTEXT: "E2E / Bare-Metal"
+      STATUS_CONTEXT: "E2E / Native-Host"
       BM_NODES: ${{ secrets.BM_NODES }}
       BM_SSH_USER: ${{ secrets.BM_SSH_USER }}
       BM_REMOTE_BASE: /tmp/spur-bm-${{ github.run_id }}
@@ -108,7 +108,7 @@ jobs:
         with:
           persist-credentials: false
           sparse-checkout: |
-            deploy/bare-metal
+            deploy/native-host
             scripts
           sparse-checkout-cone-mode: false
           path: trusted-repo
@@ -196,49 +196,49 @@ jobs:
             done
           done
 
-      - name: Run single-node bare-metal tests
+      - name: Run single-node native-host tests
         env:
           SPUR_TEST_BM_NODES: ${{ env.BM_NODES }}
           SPUR_TEST_BM_SSH_USER: ${{ secrets.BM_SSH_USER }}
           SPUR_TEST_BM_BINARIES_DIR: /tmp/release-binaries
-          SPUR_TEST_BM_DEPLOY_DIR: trusted-repo/deploy/bare-metal
+          SPUR_TEST_BM_DEPLOY_DIR: trusted-repo/deploy/native-host
           SPUR_TEST_BM_REMOTE_DIR: ${{ env.BM_REMOTE_BASE }}/single-node
           RUST_LOG: info
         run: |
           chmod +x /tmp/e2e-bin/spur-k8s-tests
-          /tmp/e2e-bin/spur-k8s-tests bare_metal::single_node --ignored --test-threads=1
+          /tmp/e2e-bin/spur-k8s-tests native_host::single_node --ignored --test-threads=1
 
-      - name: Run multi-node bare-metal tests
+      - name: Run multi-node native-host tests
         env:
           SPUR_TEST_BM_NODES: ${{ env.BM_NODES }}
           SPUR_TEST_BM_SSH_USER: ${{ secrets.BM_SSH_USER }}
           SPUR_TEST_BM_BINARIES_DIR: /tmp/release-binaries
-          SPUR_TEST_BM_DEPLOY_DIR: trusted-repo/deploy/bare-metal
+          SPUR_TEST_BM_DEPLOY_DIR: trusted-repo/deploy/native-host
           SPUR_TEST_BM_REMOTE_DIR: ${{ env.BM_REMOTE_BASE }}/multi-node
           RUST_LOG: info
-        run: /tmp/e2e-bin/spur-k8s-tests bare_metal::multi_node --ignored --test-threads=1
+        run: /tmp/e2e-bin/spur-k8s-tests native_host::multi_node --ignored --test-threads=1
 
-      - name: Run single-node GPU bare-metal tests
+      - name: Run single-node GPU native-host tests
         env:
           SPUR_TEST_BM_NODES: ${{ env.BM_NODES }}
           SPUR_TEST_BM_SSH_USER: ${{ secrets.BM_SSH_USER }}
           SPUR_TEST_BM_BINARIES_DIR: /tmp/release-binaries
-          SPUR_TEST_BM_DEPLOY_DIR: trusted-repo/deploy/bare-metal
+          SPUR_TEST_BM_DEPLOY_DIR: trusted-repo/deploy/native-host
           SPUR_TEST_BM_REMOTE_DIR: ${{ env.BM_REMOTE_BASE }}/gpu-single-node
           SPUR_TEST_BM_GPU_VENV: /opt/spur-ci/gpu-venv
           RUST_LOG: info
-        run: /tmp/e2e-bin/spur-k8s-tests bare_metal::gpu::single_node --ignored --test-threads=1
+        run: /tmp/e2e-bin/spur-k8s-tests native_host::gpu::single_node --ignored --test-threads=1
 
-      - name: Run multi-node GPU bare-metal tests
+      - name: Run multi-node GPU native-host tests
         env:
           SPUR_TEST_BM_NODES: ${{ env.BM_NODES }}
           SPUR_TEST_BM_SSH_USER: ${{ secrets.BM_SSH_USER }}
           SPUR_TEST_BM_BINARIES_DIR: /tmp/release-binaries
-          SPUR_TEST_BM_DEPLOY_DIR: trusted-repo/deploy/bare-metal
+          SPUR_TEST_BM_DEPLOY_DIR: trusted-repo/deploy/native-host
           SPUR_TEST_BM_REMOTE_DIR: ${{ env.BM_REMOTE_BASE }}/gpu-multi-node
           SPUR_TEST_BM_GPU_VENV: /opt/spur-ci/gpu-venv
           RUST_LOG: info
-        run: /tmp/e2e-bin/spur-k8s-tests bare_metal::gpu::multi_node --ignored --test-threads=1
+        run: /tmp/e2e-bin/spur-k8s-tests native_host::gpu::multi_node --ignored --test-threads=1
 
       - name: Collect cluster logs
         if: failure()
@@ -278,7 +278,7 @@ jobs:
         if: failure() && steps.scrub-logs.outcome == 'success'
         uses: actions/upload-artifact@v7
         with:
-          name: bare-metal-logs
+          name: native-host-logs
           path: /tmp/bm-logs/
           retention-days: 3
           if-no-files-found: ignore

.github/workflows/nightly.yml

@@ -84,7 +84,7 @@ jobs:
           cd ../..
 
           mkdir -p "${DIST}/etc"
-          cp deploy/bare-metal/spur.conf "${DIST}/etc/spur.conf.example"
+          cp deploy/native-host/spur.conf "${DIST}/etc/spur.conf.example"
 
           tar czf "${DIST}.tar.gz" "${DIST}"
           sha256sum "${DIST}.tar.gz" > "${DIST}.tar.gz.sha256"

.github/workflows/release.yml

@@ -54,7 +54,7 @@ jobs:
 
           # Include config + deploy examples
           mkdir -p "${DIST}/etc"
-          cp deploy/bare-metal/spur.conf "${DIST}/etc/spur.conf.example"
+          cp deploy/native-host/spur.conf "${DIST}/etc/spur.conf.example"
 
           tar czf "${DIST}.tar.gz" "${DIST}"
           sha256sum "${DIST}.tar.gz" > "${DIST}.tar.gz.sha256"

README.md

@@ -31,7 +31,7 @@ spur run -- echo "hello from $(hostname)"        # run a command
 spur queue                                       # check the queue
 ```
 
-For production and multi-node deployments, see the [deployment guide](docs/deployment/bare-metal.rst).
+For production and multi-node deployments, see the [deployment guide](docs/deployment/native-host.rst).
 
 ## Documentation
 

crates/spur-core/src/config.rs

@@ -580,7 +580,7 @@ pub struct NotificationConfig {
     pub from_address: Option<String>,
 }
 
-/// Job isolation configuration for bare-metal and container jobs.
+/// Job isolation configuration for native-host and container jobs.
 ///
 /// Each layer operates independently and degrades gracefully when the
 /// kernel doesn't support it or spurd isn't running as root.
@@ -604,7 +604,7 @@ pub struct IsolationConfig {
     /// seccomp-BPF syscall filter (kernel 3.5+).
     #[serde(default = "default_true_fn")]
     pub seccomp: bool,
-    /// Landlock filesystem access control (kernel 5.13+, bare-metal only).
+    /// Landlock filesystem access control (kernel 5.13+, native-host only).
     #[serde(default = "default_true_fn")]
     pub landlock: bool,
 }

crates/spur-core/src/node.rs

@@ -197,9 +197,9 @@ impl std::fmt::Display for NodeState {
 #[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(tag = "type")]
 pub enum NodeSource {
-    /// Traditional bare-metal node running spurd.
+    /// Traditional native-host node running spurd.
     #[default]
-    BareMetal,
+    NativeHost,
     /// Kubernetes node managed by the spur-k8s operator.
     Kubernetes { namespace: String },
 }
@@ -217,7 +217,7 @@ pub struct Node {
     #[serde(default)]
     pub admin_locked: bool,
     pub partitions: Vec<String>,
-    /// Where this node comes from (bare-metal or K8s).
+    /// Where this node comes from (native-host or K8s).
     #[serde(default)]
     pub source: NodeSource,
 

crates/spur-k8s/src/heartbeat.rs

@@ -14,7 +14,7 @@ const INTERVAL_SECS: u64 = 30;
 
 /// Tracks the set of active K8s nodes and sends periodic `Heartbeat` RPCs
 /// to spurctld on their behalf, mirroring what `spurd`'s `reporter::heartbeat_loop`
-/// does for bare-metal nodes.
+/// does for native-host nodes.
 ///
 /// `node_watcher` holds an `Arc<HeartbeatManager>` and calls `track`/`untrack`
 /// as nodes appear and disappear; the heartbeat task calls `run` under

crates/spur-tests/src/lib.rs

@@ -36,8 +36,8 @@ pub mod harness;
 // K8s integration tests (require a live cluster, run with `-- --ignored`)
 pub mod k8s;
 
-// Bare-metal E2E tests (require SSH + nodes, run with `-- --ignored`)
-pub mod bare_metal;
+// Native-host E2E tests (require SSH + nodes, run with `-- --ignored`)
+pub mod native_host;
 
 // Unit / component tests (no running daemons needed)
 pub mod t01_run;

…ates/spur-tests/src/bare_metal/config.rs …tes/spur-tests/src/native_host/config.rscrates/spur-tests/src/bare_metal/config.rs renamed to crates/spur-tests/src/native_host/config.rs crates/spur-tests/src/bare_metal/config.rs renamed to crates/spur-tests/src/native_host/config.rs

@@ -5,7 +5,7 @@ use std::path::PathBuf;
 
 use anyhow::{bail, Result};
 
-/// Bare-metal test configuration from environment variables.
+/// Native-host test configuration from environment variables.
 #[derive(Debug, Clone)]
 pub struct TestConfig {
     pub nodes: Vec<String>,

…tes/spur-tests/src/bare_metal/fixture.rs …es/spur-tests/src/native_host/fixture.rscrates/spur-tests/src/bare_metal/fixture.rs renamed to crates/spur-tests/src/native_host/fixture.rs crates/spur-tests/src/bare_metal/fixture.rs renamed to crates/spur-tests/src/native_host/fixture.rs

@@ -15,8 +15,8 @@ use super::ssh::SshNode;
 
 const BM_BINARIES: [&str; 3] = ["spurctld", "spurd", "spur"];
 
-/// Deployed bare-metal cluster for E2E tests.
-pub struct BareMetalFixture {
+/// Deployed native-host cluster for E2E tests.
+pub struct NativeHostFixture {
     pub config: TestConfig,
     pub nodes: Vec<SshNode>,
     pub node_names: Vec<String>,
@@ -29,7 +29,7 @@ pub struct BareMetalFixture {
     pub ssh_user: String,
 }
 
-impl BareMetalFixture {
+impl NativeHostFixture {
     pub async fn deploy(config: TestConfig) -> Result<Self> {
         config.validate_binaries()?;
         info!("deploy: validated binaries");
@@ -152,7 +152,7 @@ impl BareMetalFixture {
 
         info!("waiting for all nodes to become idle");
         fixture.wait_all_idle(Duration::from_secs(120)).await?;
-        info!(nodes = ?fixture.node_names, "bare-metal cluster ready");
+        info!(nodes = ?fixture.node_names, "native-host cluster ready");
         Ok(fixture)
     }
 
@@ -305,7 +305,7 @@ impl BareMetalFixture {
             node.kill_processes("spurd").await?;
             node.rm_rf(&self.remote_dir).await?;
         }
-        info!("bare-metal cluster torn down");
+        info!("native-host cluster torn down");
         Ok(())
     }
 
@@ -355,7 +355,7 @@ impl BareMetalFixture {
     /// compiled gpu_test binary, ephemeral venv with PyTorch, and generated
     /// job wrapper scripts that activate the venv.
     pub async fn ship_gpu_assets(&self) {
-        let deploy = bare_metal_deploy_dir();
+        let deploy = native_host_deploy_dir();
         let rd = &self.remote_dir;
         let venv_path = self.resolve_gpu_venv().await;
 
@@ -702,7 +702,7 @@ memory_mb = 262144
     }
 
     format!(
-        r#"cluster_name = "bare-metal-ci"
+        r#"cluster_name = "native-host-ci"
 
 [scheduler]
 interval_secs = 1
@@ -749,14 +749,14 @@ pub fn parse_job_id(sbatch_output: &str) -> Option<u32> {
         .and_then(|s| s.parse().ok())
 }
 
-/// Path to deploy/bare-metal scripts (respects `SPUR_TEST_BM_DEPLOY_DIR`).
-pub fn bare_metal_deploy_dir() -> std::path::PathBuf {
+/// Path to deploy/native-host scripts (respects `SPUR_TEST_BM_DEPLOY_DIR`).
+pub fn native_host_deploy_dir() -> std::path::PathBuf {
     if let Ok(dir) = std::env::var("SPUR_TEST_BM_DEPLOY_DIR") {
         return std::path::PathBuf::from(dir);
     }
     std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
         .parent()
         .and_then(|p| p.parent())
-        .map(|p| p.join("deploy/bare-metal"))
-        .unwrap_or_else(|| std::path::PathBuf::from("deploy/bare-metal"))
+        .map(|p| p.join("deploy/native-host"))
+        .unwrap_or_else(|| std::path::PathBuf::from("deploy/native-host"))
 }