phd: automatically fetch crucible-downstairs from Buildomat

.github/buildomat/jobs/phd-run.sh

@@ -58,6 +58,7 @@ set +e
 (RUST_BACKTRACE=1 ptime -m pfexec $runner \
 	--emit-bunyan \
 	run \
+	--crucible-downstairs-commit auto \
 	--propolis-server-cmd $propolis \
 	--artifact-toml-path $artifacts \
 	--tmp-directory $tmpdir \

Cargo.toml

@@ -95,6 +95,7 @@ bitvec = "1.0"
 byteorder = "1"
 bytes = "1.1"
 camino = "1.1.6"
+cargo_metadata = "0.18.1"
 cc = "1.0.73"
 cfg-if = "1.0.0"
 chrono = "0.4.19"
@@ -108,6 +109,7 @@ errno = "0.2.8"
 expectorate = "1.0.5"
 fatfs = "0.3.6"
 futures = "0.3"
+flate2 = "1.0.28"
 hex = "0.4.3"
 http = "0.2.9"
 hyper = "0.14"
@@ -139,6 +141,7 @@ slog-dtrace = "0.2.3"
 slog-term = "2.8"
 strum = "0.25"
 syn = "1.0"
+tar = "0.4"
 tempfile = "3.2"
 thiserror = "1.0"
 tokio = "1"

phd-tests/framework/Cargo.toml

@@ -15,6 +15,7 @@ camino = { workspace = true, features = ["serde1"] }
 cfg-if.workspace = true
 errno.workspace = true
 futures.workspace = true
+flate2.workspace = true
 hex.workspace = true
 libc.workspace = true
 propolis-client.workspace = true
@@ -27,6 +28,7 @@ serde_json.workspace = true
 slog.workspace = true
 slog-async.workspace = true
 slog-term.workspace = true
+tar.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["full"] }
 tokio-tungstenite.workspace = true

phd-tests/framework/src/artifacts/mod.rs

@@ -5,6 +5,7 @@
 //! Support for working with files consumed by PHD test runs.
 
 use serde::{Deserialize, Serialize};
+use std::str::FromStr;
 
 mod manifest;
 mod store;
@@ -13,20 +14,27 @@ pub use store::Store as ArtifactStore;
 
 pub const DEFAULT_PROPOLIS_ARTIFACT: &str = "__DEFAULT_PROPOLIS";
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+pub const CRUCIBLE_DOWNSTAIRS_ARTIFACT: &str = "__DEFAULT_CRUCIBLE_DOWNSTAIRS";
+
+#[derive(Clone, Debug, Serialize, Eq, PartialEq)]
+#[serde(transparent)]
+pub struct Commit(String);
+
+#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
 #[serde(rename_all = "snake_case")]
 enum ArtifactKind {
     GuestOs(crate::guest_os::GuestOsKind),
     Bootrom,
     PropolisServer,
+    CrucibleDownstairs,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
 enum ArtifactSource {
     /// Get the artifact from Buildomat. This downloads from
     /// https://buildomat.eng.oxide.computer/public/file/REPO/SERIES/COMMIT.
-    Buildomat { repo: String, series: String, commit: String, sha256: String },
+    Buildomat { repo: String, series: String, commit: Commit, sha256: String },
 
     /// Get the artifact from the manifest's list of remote artifact servers.
     RemoteServer { sha256: String },
@@ -48,4 +56,50 @@ struct Artifact {
     /// The source to use to obtain this artifact if it's not present on the
     /// host system.
     source: ArtifactSource,
+
+    /// If present, this artifact is a tarball, and the provided file should be
+    /// extracted.
+    untar: Option<camino::Utf8PathBuf>,
+}
+
+impl FromStr for Commit {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let s = s.trim();
+
+        // Ensure this looks like a valid Git commit.
+        anyhow::ensure!(
+            s.len() == 40,
+            "Buildomat requires full (40-character) Git commit hashes"
+        );
+
+        for c in s.chars() {
+            if !c.is_ascii_hexdigit() {
+                anyhow::bail!(
+                    "'{c}' is not a valid hexadecimal digit; Git \
+                    commit hashes should consist of the characters \
+                    [0-9, a-f, A-F]"
+                );
+            }
+        }
+
+        Ok(Self(s.to_string()))
+    }
+}
+
+impl std::fmt::Display for Commit {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(&self.0)
+    }
+}
+
+impl<'de> Deserialize<'de> for Commit {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let s = String::deserialize(deserializer)?;
+        FromStr::from_str(&s).map_err(serde::de::Error::custom)
+    }
 }