Skip to content

Add downloaded blobs to package tarball #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2025

Conversation

pfmooney
Copy link
Contributor

While updating propolis to from its quite old (0.9) version of omicron-zone-package, I noticed that the S3 blobs included in its manifest were being downloaded but not appended to the archive. It appears that such functionality was disrupted as part of the overhaul in #60.

This should restore blob inclusion in the package.

Copy link
Collaborator

@smklein smklein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks for patching this!

@pfmooney
Copy link
Contributor Author

Testing notes

Tarball contents for propolis-server (using omicron-zone-package 0.12) prior to this change:

-rw-r--r--   0/0       63 Jul 24 01:21 2006 oxide.json
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/var
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/var/svc
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/var/svc/manifest
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/var/svc/manifest/site
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/var/svc/manifest/site/propolis-server
-rw-r--r--   0/0     1795 Jul 24 01:21 2006 root/var/svc/manifest/site/propolis-server/manifest.xml
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide/lib
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide/lib/svc
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide/lib/svc/manifest
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide/lib/svc/manifest/propolis
-rwxr-xr-x   0/0     1320 Jul 24 01:21 2006 root/opt/oxide/lib/svc/manifest/propolis/propolis.sh
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide/propolis-server
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide/propolis-server/bin
-rwxr-xr-x   0/0   62427560 Jul 24 01:21 2006 root/opt/oxide/propolis-server/bin/propolis-server

And using a cargo-patched version with the change:

-rw-r--r--   0/0       63 Jul 24 01:21 2006 oxide.json
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/var
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/var/svc
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/var/svc/manifest
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/var/svc/manifest/site
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/var/svc/manifest/site/propolis-server
-rw-r--r--   0/0     1795 Jul 24 01:21 2006 root/var/svc/manifest/site/propolis-server/manifest.xml
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide/lib
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide/lib/svc
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide/lib/svc/manifest
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide/lib/svc/manifest/propolis
-rwxr-xr-x   0/0     1320 Jul 24 01:21 2006 root/opt/oxide/lib/svc/manifest/propolis/propolis.sh
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide/propolis-server
-rwxr-xr-x   0/0        0 Jul 24 01:21 2006 root/opt/oxide/propolis-server/bin
-rwxr-xr-x   0/0   62427560 Jul 24 01:21 2006 root/opt/oxide/propolis-server/bin/propolis-server
-rw-r--r--   0/0   49283072 Jul 24 01:21 2006 root/opt/oxide/propolis-server/blob/alpine.iso
-rw-r--r--   0/0   1966080 Jul 24 01:21 2006 root/opt/oxide/propolis-server/blob/OVMF_CODE.fd

@pfmooney pfmooney merged commit e3d0ef0 into oxidecomputer:main Apr 17, 2025
5 checks passed
@pfmooney pfmooney deleted the blob-fix branch April 17, 2025 21:12
@pfmooney pfmooney mentioned this pull request Apr 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants