tests/sysexts: Run on streams based on stable Fedora releases #3960
+12
−1
Conversation
This file contains hidden or 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
Get the stream from the fedora-coreos.stream annotation from the container image.
The sysexts used for this test are only built for stable Fedora releases for now so skip it everywhere else.
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request updates how the FCOS stream is determined and restricts a sysext test to run only on stable Fedora release streams. The change to get_fcos_stream correctly fetches the stream from container image annotations. The sysext test is now skipped on unsupported streams. I've suggested a small improvement to make the get_fcos_stream function more efficient by combining two jq calls into one.
Comment on lines
+39
to
+41
| rpm-ostree status -b --json \ | ||
| | jq -r '.deployments[0]."base-commit-meta"."ostree.manifest"' \ | ||
| | jq -r '.annotations."fedora-coreos.stream"' |
There was a problem hiding this comment.
The two separate jq invocations can be combined into a single one for better performance and readability. The ostree.manifest field contains a JSON string, which can be parsed within jq using the fromjson filter. This avoids creating an extra process and a pipe.
Suggested change
| rpm-ostree status -b --json \ | |
| | jq -r '.deployments[0]."base-commit-meta"."ostree.manifest"' \ | |
| | jq -r '.annotations."fedora-coreos.stream"' | |
| rpm-ostree status -b --json | jq -r '.deployments[0]."base-commit-meta"."ostree.manifest" | fromjson | .annotations."fedora-coreos.stream"' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
tests/kola/commonlib: Fix get_fcos_stream for container case
Get the stream from the fedora-coreos.stream annotation from the
container image.
tests/sysexts: Run only on streams based on stable Fedora releases
The sysexts used for this test are only built for stable Fedora releases
for now so skip it everywhere else.