Merge branch 'main' into ajs/vmm-reservoir-bg-thread

oxidecomputer · Mar 7, 2024 · 332832e · 332832e
2 parents 5b01ef0 + 6a0d1af
commit 332832e
Show file tree

Hide file tree

Showing 27 changed files with 671 additions and 322 deletions.
diff --git a/.github/buildomat/jobs/deploy.sh b/.github/buildomat/jobs/deploy.sh
@@ -102,19 +102,6 @@ z_swadm () {
 	pfexec zlogin oxz_switch /opt/oxide/dendrite/bin/swadm $@
 }
 
-# XXX remove. This is just to test against a development branch of OPTE in CI.
-set +x
-OPTE_COMMIT="73d4669ea213d0b7aca35c4babb6fd09ed51d29e"
-curl  -sSfOL https://buildomat.eng.oxide.computer/public/file/oxidecomputer/opte/module/$OPTE_COMMIT/xde
-pfexec rem_drv xde || true
-pfexec mv xde /kernel/drv/amd64/xde
-pfexec add_drv xde || true
-curl -sSfOL https://buildomat.eng.oxide.computer/wg/0/artefact/01HM09S4M15WNXB2B2MX8R1GBT/yLalJU5vT4S4IEpwSeY4hPuspxw3JcINokZmlfNU14npHkzG/01HM09SJ2RQSFGW7MVKC9JKZ8D/01HM0A58D888AJ7YP6N1Q6T6ZD/opteadm
-chmod +x opteadm
-cp opteadm /tmp/opteadm
-pfexec mv opteadm /opt/oxide/opte/bin/opteadm
-set -x
-
 #
 # XXX work around 14537 (UFS should not allow directories to be unlinked) which
 # is probably not yet fixed in xde branch?  Once the xde branch merges from
@@ -161,7 +148,7 @@ cd /opt/oxide/work
 
 ptime -m tar xvzf /input/package/work/package.tar.gz
 cp /input/package/work/zones/* out/
-mv out/omicron-nexus-single-sled.tar.gz out/omicron-nexus.tar.gz
+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}")"

diff --git a/.github/buildomat/jobs/package.sh b/.github/buildomat/jobs/package.sh
@@ -84,7 +84,7 @@ stamp_packages() {
 
 # Keep the single-sled Nexus zone around for the deploy job. (The global zone
 # build below overwrites the file.)
-mv out/omicron-nexus.tar.gz out/omicron-nexus-single-sled.tar.gz
+mv out/nexus.tar.gz out/nexus-single-sled.tar.gz
 
 # Build necessary for the global zone
 ptime -m cargo run --locked --release --bin omicron-package -- \
@@ -115,8 +115,8 @@ zones=(
   out/crucible-zone.tar.gz
   out/external-dns.tar.gz
   out/internal-dns.tar.gz
-  out/omicron-nexus.tar.gz
-  out/omicron-nexus-single-sled.tar.gz
+  out/nexus.tar.gz
+  out/nexus-single-sled.tar.gz
   out/oximeter.tar.gz
   out/propolis-server.tar.gz
   out/switch-*.tar.gz

diff --git a/.github/buildomat/jobs/tuf-repo.sh b/.github/buildomat/jobs/tuf-repo.sh
@@ -93,7 +93,7 @@ target/release/omicron-package -t default target create -i standard -m gimlet -s
 ln -s /input/package/work/zones/* out/
 rm out/switch-softnpu.tar.gz  # not used when target switch=asic
 rm out/omicron-gateway-softnpu.tar.gz  # not used when target switch=asic
-rm out/omicron-nexus-single-sled.tar.gz # only used for deploy tests
+rm out/nexus-single-sled.tar.gz # only used for deploy tests
 for zone in out/*.tar.gz; do
     target/release/omicron-package stamp "$(basename "${zone%.tar.gz}")" "$VERSION"
 done

diff --git a/.github/workflows/hakari.yml b/.github/workflows/hakari.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           toolchain: stable
       - name: Install cargo-hakari
-        uses: taiki-e/install-action@dabb9c1ee51c21c545764a0d517f069ff52e6477 # v2
+        uses: taiki-e/install-action@4978b3c8549425a60eb2d68446d0b58cef63ad0a # v2
         with:
           tool: cargo-hakari
       - name: Check workspace-hack Cargo.toml is up-to-date