Misc image tool script improvements #264
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Removes the stray `64` suffix from the image filenames/mount directories on disk. This doesn't affect the filename on S3. * Adds comments to the `mkfs` / `tune2fs` usages, since there purpose and arguments are IMO not immediately obvious. Split out of #263. GUS-W-15245261.
Malax
approved these changes
Mar 18, 2024
edmorley
added a commit
that referenced
this pull request
Mar 21, 2024
At the very end of the image publishing process, Cheverny is notified that the images have been uploaded and the staging manifest should be updated, via the `publish-manifests` script. For the v123 release, this script silently didn't publish the manifests: https://github.com/heroku/base-images/actions/runs/8366257519/job/22906072260#step:7:123 Compare to the previous release: https://github.com/heroku/base-images/actions/runs/8229492350/job/22500811676#step:7:101 It turns out this is due to: - The script relying on the glob `/tmp/*64-*.manifest` to determine which stacks were built. - That glob no longer matching after #264 (where the `64` bit reference was removed). To make things worse, the script not only doesn't fail if no manifests are found, but it also piped any errors to `/dev/null` in: `ls /tmp/*64-*.manifest >& /dev/null` As such, I've: - updated the glob to match the new manifest filename format - removed the conditional (since there is no scenario in which the manifests being missing is expected) - for completeness, added `--exit-status` to the `jq` usage, to make it exit non-zero in more cases (jq would have exited non-zero for this no-files-matched case anyway, so this is just for completeness) See: https://jqlang.github.io/jq/manual/#invoking-jq GUS-W-15304768.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
64suffix from the image filenames/mount directories on disk. This doesn't affect the filename on S3.mkfs/tune2fsusages, since their purpose and arguments are IMO not immediately obvious.Docs for the related tools:
https://manpages.ubuntu.com/manpages/jammy/en/man8/mkfs.8.html
https://manpages.ubuntu.com/manpages/jammy/en/man8/tune2fs.8.html
Split out of #263.
GUS-W-15245261.