[buildomat] Job to create Helios trampoline image

.github/buildomat/jobs/package.sh

@@ -7,13 +7,19 @@
 #: output_rules = [
 #:	"=/work/package.tar.gz",
 #:	"=/work/global-zone-packages.tar.gz",
+#:	"=/work/trampoline-global-zone-packages.tar.gz",
 #:	"=/work/zones/*.tar.gz",
 #: ]
 #:
 #: [[publish]]
 #: series = "image"
 #: name = "global-zone-packages"
 #: from_output = "/out/global-zone-packages.tar.gz"
+#:
+#: [[publish]]
+#: series = "image"
+#: name = "trampoline-global-zone-packages"
+#: from_output = "/out/trampoline-global-zone-packages.tar.gz"
 
 set -o errexit
 set -o pipefail
@@ -26,6 +32,7 @@ rustc --version
 ptime -m ./tools/install_builder_prerequisites.sh -yp
 ptime -m cargo run --locked --release --bin omicron-package -- -t 'image_type=standard switch_variant=asic' package
 ptime -m cargo run --locked --release --bin omicron-package -- -t 'image_type=standard switch_variant=stub' package
+ptime -m cargo run --locked --release --bin omicron-package -- -t 'image_type=trampoline' package
 
 tarball_src_dir="$(pwd)/out"
 
@@ -42,39 +49,77 @@ files=(
 
 ptime -m tar cvzf /work/package.tar.gz "${files[@]}"
 
-# Assemble global zone files in a temporary directory.
-if ! tmp=$(mktemp -d); then
+#
+# Global Zone files for Host OS
+#
+
+if ! tmp_gz=$(mktemp -d); then
   exit 1
 fi
-trap 'cd /; rm -rf "$tmp"' EXIT
+trap 'cd /; rm -rf "$tmp_gz"' EXIT
 
 # Header file, identifying this is intended to be layered in the global zone.
 # Within the ramdisk, this means that all files under "root/foo" should appear
 # in the global zone as "/foo".
-echo '{"v":"1","t":"layer"}' > "$tmp/oxide.json"
+echo '{"v":"1","t":"layer"}' > "$tmp_gz/oxide.json"
 
 # Extract the sled-agent tarball for re-packaging into the layered GZ archive.
-pkg_dir="$tmp/root/opt/oxide/sled-agent"
+pkg_dir="$tmp_gz/root/opt/oxide/sled-agent"
 mkdir -p "$pkg_dir"
 cd "$pkg_dir"
 tar -xvfz "$tarball_src_dir/omicron-sled-agent.tar"
 # Ensure that the manifest for the sled agent exists in a location where it may
 # be automatically initialized.
-mkdir -p "$tmp/root/lib/svc/manifest/site/"
-mv pkg/manifest.xml "$tmp/root/lib/svc/manifest/site/sled-agent.xml"
+mkdir -p "$tmp_gz/root/lib/svc/manifest/site/"
+mv pkg/manifest.xml "$tmp_gz/root/lib/svc/manifest/site/sled-agent.xml"
+cd -
+# Extract the mg-ddm tarball for re-packaging into the layered GZ archive.
+pkg_dir="$tmp_gz/root/opt/oxide/mg-ddm"
+mkdir -p "$pkg_dir"
+cd "$pkg_dir"
+tar -xvfz "$tarball_src_dir/maghemite.tar"
+cd -
+
+mkdir -p /work
+cd "$tmp_gz" && tar cvfz /work/global-zone-packages.tar.gz oxide.json root
 cd -
 
+#
+# Global Zone files for for Trampoline image
+#
+
+if ! tmp_trampoline=$(mktemp -d); then
+  exit 1
+fi
+trap 'cd /; rm -rf "$tmp_trampoline"' EXIT
+
+echo '{"v":"1","t":"layer"}' > "$tmp_trampoline/oxide.json"
+
+# Extract the installinator tarball for re-packaging into the layered GZ archive.
+pkg_dir="$tmp_trampoline/root/opt/oxide/installinator"
+mkdir -p "$pkg_dir"
+cd "$pkg_dir"
+tar -xvfz "$tarball_src_dir/installinator.tar"
+# Ensure that the manifest for the installinator exists in a location where it may
+# be automatically initialized.
+mkdir -p "$tmp_trampoline/root/lib/svc/manifest/site/"
+mv pkg/manifest.xml "$tmp_trampoline/root/lib/svc/manifest/site/installinator.xml"
+cd -
 # Extract the mg-ddm tarball for re-packaging into the layered GZ archive.
-pkg_dir="$tmp/root/opt/oxide/mg-ddm"
+pkg_dir="$tmp_trampoline/root/opt/oxide/mg-ddm"
 mkdir -p "$pkg_dir"
 cd "$pkg_dir"
 tar -xvfz "$tarball_src_dir/maghemite.tar"
 cd -
 
 mkdir -p /work
-cd "$tmp" && tar cvfz /work/global-zone-packages.tar.gz oxide.json root
+cd "$tmp_trampoline" && tar cvfz /work/trampoline-global-zone-packages.tar.gz oxide.json root
 cd -
 
+#
+# Non-Global Zones
+#
+
 # Assemble Zone Images into their respective output locations.
 mkdir -p /work/zones
 zones=(

.github/buildomat/jobs/recovery-image.sh

@@ -0,0 +1,89 @@
+#!/bin/bash
+#:
+#: name = "helios / build recovery OS image"
+#: variety = "basic"
+#: target = "helios-latest"
+#: rust_toolchain = "1.66.1"
+#: output_rules = [
+#:	"=/work/helios/image/output/zfs.img",
+#:	"=/work/helios/image/output/rom",
+#: ]
+#: skip_clone = true
+#: access_repos = [
+#:	"oxidecomputer/amd-apcb",
+#:	"oxidecomputer/amd-efs",
+#:	"oxidecomputer/amd-firmware",
+#:	"oxidecomputer/amd-flash",
+#:	"oxidecomputer/amd-host-image-builder",
+#:	"oxidecomputer/boot-image-tools",
+#:	"oxidecomputer/chelsio-t6-roms",
+#:	"oxidecomputer/helios",
+#:	"oxidecomputer/helios-omnios-build",
+#:	"oxidecomputer/helios-omnios-extra",
+#:	"oxidecomputer/nanobl-rs",
+#: ]
+#:
+#: [dependencies.package]
+#: job = "helios / package"
+#:
+
+set -o errexit
+set -o pipefail
+set -o xtrace
+
+cargo --version
+rustc --version
+
+#
+# The token authentication mechanism that affords us access to other private
+# repositories requires that we use HTTPS URLs for GitHub, rather than SSH.
+#
+override_urls=(
+    'git://github.com/'
+    '[email protected]:'
+    'ssh://github.com/'
+    'ssh://[email protected]/'
+)
+for (( i = 0; i < ${#override_urls[@]}; i++ )); do
+	git config --add --global url.https://github.com/.insteadOf \
+	    "${override_urls[$i]}"
+done
+
+#
+# Require that cargo use the git CLI instead of the built-in support.  This
+# achieves two things: first, SSH URLs should be transformed on fetch without
+# requiring Cargo.toml rewriting, which is especially difficult in transitive
+# dependencies; second, Cargo does not seem willing on its own to look in
+# ~/.netrc and find the temporary token that buildomat generates for our job,
+# so we must use git which uses curl.
+#
+export CARGO_NET_GIT_FETCH_WITH_CLI=true
+
+pfexec mkdir -p /work
+cd /work
+
+# /work/gz: Global Zone artifacts to be placed in the Helios image.
+mkdir gz && cd gz
+ptime -m tar xvzf /input/package/work/trampoline-global-zone-packages.tar.gz
+cd -
+
+# TODO: Consider importing zones here too?
+
+# Checkout helios at a pinned commit
+git clone https://github.com/oxidecomputer/helios.git
+cd helios
+git checkout ac8a7e7ef9e9b5ef27334bc8016f5d123f852449
+
+# Create the "./helios-build" command, which lets us build images
+gmake setup
+
+# Commands that "./helios-build" would ask us to run (either explicitly
+# or implicitly, to avoid an error).
+pfexec pkg install /system/zones/brand/omicron1/tools
+pfexec zfs create -p rpool/images/build
+
+./helios-build experiment-image \
+	-p helios-netdev=https://pkg.oxide.computer/helios-netdev \
+	-F optever=0.21 \
+	-P /work/gz/root \
+	-R