rpm2img: use latest rpm release for inventory #342
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
bcressey
reviewed
Aug 2, 2024
twoliter/embedded/rpm2img
Outdated
Comment on lines
200
to
204
| sort -r -k 1,2 | \ | ||
| head -n 1 | \ | ||
| cut -d ' ' -f 3 | \ | ||
| awk '/^1/{print $1}' | \ | ||
| cut -d '.' -f 3)" |
There was a problem hiding this comment.
head usage often leads to SIGPIPE since it doesn't keep reading from the pipe after a match, and we have -o pipefail set.
I would just pass it to awk after the initial sort:
Suggested change
| sort -r -k 1,2 | \ | |
| head -n 1 | \ | |
| cut -d ' ' -f 3 | \ | |
| awk '/^1/{print $1}' | \ | |
| cut -d '.' -f 3)" | |
| sort -r -k 1,2 | \ | |
| awk -F '.' 'END {print $--NF}' )" |
and maybe add a check that CORE_KIT_GIT_SHA is actually non-zero length.
There was a problem hiding this comment.
Nice, I really need to learn more awk. Only modification I made here was to undo the -r since we're grabbing the release from the last line instead of the first.
|
^ Makes suggestions from @bcressey. Still testing that the if statements catch the failure cases. |
bcressey
approved these changes
Aug 2, 2024
| echo "Extracted invalid Git sha from bottlerocket-core-kit: '${CORE_KIT_GIT_SHA}'" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
gthao313
approved these changes
Aug 2, 2024
sumukhballal
approved these changes
Aug 2, 2024
Merged
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.
Description of changes:
In cases where Kits contained RPMs built from multiple git checkouts, the
Releasefield in the inventory could be malformed.This always selects the most-recent release present for the inventory.
Testing done:
Before:
After:
I actually couldn't create a package with no BUILD_ID. RPM rejected it.
Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.