Skip to content

Commit 0c5ca49

Browse files
authored
[wicketd] Add support for TUF repo with multiple SP archives (distinct hardware revisions) (#3887)
This PR also teaches tufaceous-lib how to generate fake hubris artifacts that look like real hubris archives (at least up to having a valid caboose), via the not-yet-merged `HubrisArchiveBuilder` from `hubtools`. There are a couple things I need to do before merging this PR: - [x] Update `hubtools` in Cargo.toml once oxidecomputer/hubtools#19 lands - [x] Test on madrid with a manually-built repo with multiple SP images but I think it's close enough it can be reviewed. Fixes #3394.
1 parent 496b854 commit 0c5ca49

File tree

13 files changed

+593
-289
lines changed

13 files changed

+593
-289
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export TUFACEOUS_KEY
9494
cat >/work/manifest.toml <<EOF
9595
system_version = "$VERSION"
9696
97-
[artifact.control_plane]
97+
[[artifact.control_plane]]
9898
name = "control-plane"
9999
version = "$VERSION"
100100
[artifact.control_plane.source]
@@ -116,7 +116,7 @@ done
116116

117117
for kind in host trampoline; do
118118
cat >>/work/manifest.toml <<EOF
119-
[artifact.$kind]
119+
[[artifact.$kind]]
120120
name = "$kind"
121121
version = "$VERSION"
122122
[artifact.$kind.source]
@@ -162,7 +162,7 @@ add_hubris_artifacts() {
162162
sp_version=$(/work/caboose-util read-version "$sp_image")
163163

164164
cat >>"$manifest" <<EOF
165-
[artifact.${tufaceous_board}_rot]
165+
[[artifact.${tufaceous_board}_rot]]
166166
name = "${tufaceous_board}_rot"
167167
version = "$rot_version_a"
168168
[artifact.${tufaceous_board}_rot.source]
@@ -173,7 +173,7 @@ path = "$rot_image_a"
173173
[artifact.${tufaceous_board}_rot.source.archive_b]
174174
kind = "file"
175175
path = "$rot_image_b"
176-
[artifact.${tufaceous_board}_sp]
176+
[[artifact.${tufaceous_board}_sp]]
177177
name = "${tufaceous_board}_sp"
178178
version = "$sp_version"
179179
[artifact.${tufaceous_board}_sp.source]

0 commit comments

Comments
 (0)