Skip to content

Commit e53de82

Browse files
Exclude packages that are built into the ramdisk from the control plane image (#3803)
Currently on `main`, the `control-plane.tar.gz` in the TUF repo includes a few tarballs it doesn't need (because they're already bundled into the OS ramdisk). This PR prunes them out explicitly when building the TUF manifest. This doesn't really feel like a sustainable way to do this - maybe it should be an allowlist instead of a denylist? Or maybe there's already a better way to do this but I don't understand `package.sh` well enough to see it. --------- Co-authored-by: Andy Fiddaman <andy@oxidecomputer.com>
1 parent 2066bd5 commit e53de82

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,12 @@ version = "$VERSION"
101101
kind = "composite-control-plane"
102102
EOF
103103

104-
# Exclude `propolis-server` from the list of control plane zones: it is bundled
105-
# into the OS ramdisk. It still shows up under `.../install` for development
106-
# workflows using `omicron-package install` that don't build a full omicron OS
107-
# ramdisk, so we filter it out here.
108-
for zone in $(find /work/package/install -maxdepth 1 -type f -name '*.tar.gz' | grep -v propolis-server.tar.gz); do
104+
# Exclude a handful of tarballs from the list of control plane zones because
105+
# they are bundled into the OS ramdisk. They still show up under `.../install`
106+
# for development workflows using `omicron-package install` that don't build a
107+
# full omicron OS ramdisk, so we filter them out here.
108+
for zone in $(find /work/package/install -maxdepth 1 -type f -name '*.tar.gz' \
109+
| egrep -v '(propolis-server|mgs|overlay|switch)\.tar\.gz'); do
109110
cat >>/work/manifest.toml <<EOF
110111
[[artifact.control_plane.source.zones]]
111112
kind = "file"

0 commit comments

Comments
 (0)