Merge branch 'main' into unify

Author: smklein

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

@@ -42,13 +42,11 @@ rustc --version
 
 TOP=$PWD
 
-source "$TOP/tools/helios_version"
 source "$TOP/tools/include/force-git-over-https.sh"
 
 # Checkout helios at a pinned commit into /work/helios
 git clone https://github.com/oxidecomputer/helios.git /work/helios
 cd /work/helios
-git checkout "$COMMIT"
 
 # TODO: Consider importing zones here too?
 

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

@@ -42,13 +42,11 @@ rustc --version
 
 TOP=$PWD
 
-source "$TOP/tools/helios_version"
 source "$TOP/tools/include/force-git-over-https.sh"
 
 # Checkout helios at a pinned commit into /work/helios
 git clone https://github.com/oxidecomputer/helios.git /work/helios
 cd /work/helios
-git checkout "$COMMIT"
 
 cd "$TOP"
 ./tools/build-host-image.sh -R \

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

@@ -145,14 +145,15 @@ for noun in gimlet-c psc-b sidecar-b; do
     tufaceous_kind=${tufaceous_kind//sidecar/switch}_sp
     job_name=dist-ubuntu-latest-$noun
     url=$(/opt/ooce/bin/jq --arg name "$job_name" -r '.artifacts[] | select(.name == $name) | .archive_download_url' <<<"$artifacts")
-    curl --netrc -fsSL -o /work/$job_name.zip "$url"
+    curl --netrc -fsSL -o $job_name.zip "$url"
+    unzip $job_name.zip
     cat >>/work/manifest.toml <<EOF
 [artifact.$tufaceous_kind]
 name = "$tufaceous_kind"
 version = "$HUBRIS_VERSION"
 [artifact.$tufaceous_kind.source]
 kind = "file"
-path = "/work/$job_name.zip"
+path = "$PWD/build-$noun-image-default.zip"
 EOF
 done