Merge remote-tracking branch 'origin/main' into mike/nvme-firmware-in…

…ventory

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

@@ -76,19 +76,6 @@ export RUSTC_BOOTSTRAP=1
 # We report build progress to stderr, and the "--timings=json" output goes to stdout.
 ptime -m cargo build -Z unstable-options --timings=json --workspace --tests --locked --verbose 1> "$OUTPUT_DIR/crate-build-timings.json"
 
-# If we are running on illumos we want to verify that we are not requiring
-# system libraries outside of specific binaries. If we encounter this situation
-# we bail.
-# NB: `cargo xtask verify-libraries` runs `cargo build --bins` to ensure it can
-# check the final executables.
-if [[ $target_os == "illumos" ]]; then
-    banner verify-libraries
-    # This has a separate timeout from `cargo nextest` since `timeout` expects
-    # to run an external command and therefore we cannot run bash functions or
-    # subshells.
-    ptime -m timeout 10m cargo xtask verify-libraries
-fi
-
 #
 # We apply our own timeout to ensure that we get a normal failure on timeout
 # rather than a buildomat timeout.  See oxidecomputer/buildomat#8.

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

@@ -2,8 +2,7 @@
 #:
 #: name = "a4x2-deploy"
 #: variety = "basic"
-#: target = "lab-2.0-opte-0.27"
-#: rust_toolchain = "stable"
+#: target = "lab-2.0-opte-0.29"
 #: output_rules = [
 #:	"/out/falcon/*.log",
 #:	"/out/falcon/*.err",

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

@@ -3,7 +3,7 @@
 #: name = "a4x2-prepare"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "stable"
+#: rust_toolchain = "1.78.0"
 #: output_rules = [
 #:	"=/out/cargo-bay-ce.tgz",
 #:	"=/out/cargo-bay-cr1.tgz",

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

@@ -3,7 +3,7 @@
 #: name = "build-and-test (helios)"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "1.72.1"
+#: rust_toolchain = "1.78.0"
 #: output_rules = [
 #:	"%/work/*",
 #:	"%/var/tmp/omicron_tmp/*",

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

@@ -3,7 +3,7 @@
 #: name = "build-and-test (ubuntu-22.04)"
 #: variety = "basic"
 #: target = "ubuntu-22.04"
-#: rust_toolchain = "1.72.1"
+#: rust_toolchain = "1.78.0"
 #: output_rules = [
 #:	"%/work/*",
 #:	"%/var/tmp/omicron_tmp/*",

.github/buildomat/jobs/clippy.sh

@@ -3,7 +3,7 @@
 #: name = "clippy (helios)"
 #: variety = "basic"
 #: target = "helios-2.0"
-#: rust_toolchain = "1.72.1"
+#: rust_toolchain = "1.78.0"
 #: output_rules = []
 
 # Run clippy on illumos (not just other systems) because a bunch of our code

.github/buildomat/jobs/deploy.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "helios / deploy"
 #: variety = "basic"
-#: target = "lab-2.0-opte-0.28"
+#: target = "lab-2.0-opte-0.29"
 #: output_rules = [
 #:  "%/var/svc/log/oxide-sled-agent:default.log*",
 #:  "%/zone/oxz_*/root/var/svc/log/oxide-*.log*",
@@ -20,8 +20,6 @@
 #: [dependencies.package]
 #: job = "helios / package"
 #:
-#: [dependencies.ci-tools]
-#: job = "helios / CI tools"
 
 set -o errexit
 set -o pipefail
@@ -144,13 +142,6 @@ pfexec chown build:build /opt/oxide/work
 cd /opt/oxide/work
 
 ptime -m tar xvzf /input/package/work/package.tar.gz
-cp /input/package/work/zones/* out/
-mv out/nexus-single-sled.tar.gz out/nexus.tar.gz
-mkdir tests
-for p in /input/ci-tools/work/end-to-end-tests/*.gz; do
-	ptime -m gunzip < "$p" > "tests/$(basename "${p%.gz}")"
-	chmod a+x "tests/$(basename "${p%.gz}")"
-done
 
 # Ask buildomat for the range of extra addresses that we're allowed to use, and
 # break them up into the ranges we need.
@@ -354,7 +345,7 @@ echo "Waited for nexus: ${retry}s"
 
 export RUST_BACKTRACE=1
 export E2E_TLS_CERT IPPOOL_START IPPOOL_END
-eval "$(./tests/bootstrap)"
+eval "$(./target/debug/bootstrap)"
 export OXIDE_HOST OXIDE_TOKEN
 
 #
@@ -387,7 +378,6 @@ done
 /usr/oxide/oxide --resolve "$OXIDE_RESOLVE" --cacert "$E2E_TLS_CERT" \
 	image promote --project images --image debian11
 
-rm ./tests/bootstrap
 for test_bin in tests/*; do
 	./"$test_bin"
 done

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

@@ -0,0 +1,25 @@
+#!/bin/bash
+#:
+#: name = "omicron-common (helios)"
+#: variety = "basic"
+#: target = "helios-2.0"
+#: rust_toolchain = "1.78.0"
+#: output_rules = []
+
+# Verify that omicron-common builds successfully when used as a dependency
+# in an external project. It must not leak anything that requires an external
+# dependency (apart from OpenSSL/pkg-config).
+
+set -o errexit
+set -o pipefail
+set -o xtrace
+
+cargo --version
+rustc --version
+
+cd /tmp
+cargo new --lib test-project
+cd test-project
+cargo add omicron-common --path /work/oxidecomputer/omicron/common
+cargo check
+cargo build --release