merge main

Author: zeeshanlakhani

.github/buildomat/jobs/a4x2-prepare.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "a4x2-prepare"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-3.0"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"=/out/cargo-bay-ce.tgz",

.github/buildomat/jobs/build-and-test-helios.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "build-and-test (helios)"
 #: variety = "basic"
-#: target = "helios-2.0-32c256gb"
+#: target = "helios-3.0-32c256gb"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"%/work/*",

.github/buildomat/jobs/check-features.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "check-features (helios)"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-3.0"
 #: rust_toolchain = true
 #: output_rules = [
 #:  "/out/*",

.github/buildomat/jobs/clippy.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "clippy (helios)"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-3.0"
 #: rust_toolchain = true
 #: output_rules = []
 

.github/buildomat/jobs/deploy.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "helios / deploy"
 #: variety = "basic"
-#: target = "lab-2.0-opte-0.40"
+#: target = "lab-3.0-opte-0.40"
 #: output_rules = [
 #:  "%/var/svc/log/oxide-*.log*",
 #:  "%/zone/oxz_*/root/var/svc/log/oxide-*.log*",
@@ -246,7 +246,15 @@ routeadm -e ipv4-forwarding -u
 PXA_START="$EXTRA_IP_START"
 PXA_END="$EXTRA_IP_END"
 
-pfexec zpool create -f scratch c1t1d0 c2t1d0
+# Enumerate the names of NVMe devices on on which one might place a zpool.
+#
+# N.B. that it is fine to do use "every NVMe device on the box" since this
+# script only runs on buildomat workers which do not have any disks used for
+# storing anything persistently, and which are PXE-booted...so we're not gonna
+# clobber anything that anyone might have cared about on sock and buskin, at
+# least.
+DISKS=( $(pfexec nvmeadm list -p -o disk) )
+pfexec zpool create -f scratch "${DISKS[@]}"
 
 ptime -m \
     pfexec ./target/release/xtask virtual-hardware \

.github/buildomat/jobs/omicron-common.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "omicron-common (helios)"
 #: variety = "basic"
-#: target = "helios-2.0"
+#: target = "helios-3.0"
 #: rust_toolchain = true
 #: output_rules = []
 

.github/buildomat/jobs/package.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "helios / package"
 #: variety = "basic"
-#: target = "helios-2.0-16c64gb"
+#: target = "helios-3.0-16c64gb"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"=/work/package.tar.gz",

.github/buildomat/jobs/tuf-repo.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "helios / build TUF repo"
 #: variety = "basic"
-#: target = "helios-2.0-16c128gb"
+#: target = "helios-3.0-16c128gb"
 #: rust_toolchain = true
 #: output_rules = [
 #:	"=/work/manifest.toml",