tests/kola/commonlib: Fix get_fcos_stream for container case #3964
Conversation
![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 the get_fcos_stream function to correctly parse the stream from the container image's annotations. The implementation has been changed to handle a nested JSON structure within the rpm-ostree status output. My review includes a suggestion to optimize the jq command by combining the two separate calls into a single, more efficient one.
travier
force-pushed
the
fix-get_fcos_stream
branch
from
59020b5 to
9404ff7
Compare
Get the stream from the `com.coreos.stream` annotation from the container image.
travier
force-pushed
the
fix-get_fcos_stream
branch
from
9404ff7 to
070d3cf
Compare
|
Thanks, updated. |
| get_fcos_stream() { | ||
| rpm-ostree status -b --json | jq -r '.deployments[0]["base-commit-meta"]["fedora-coreos.stream"]' | ||
| rpm-ostree status -b --json \ | ||
| | jq -r '.deployments[0]."base-commit-meta"."ostree.manifest" | fromjson | .annotations."com.coreos.stream"' |
There was a problem hiding this comment.
I think what JB was saying is that we are moving towards the label being the source of truth (not the annotation) so:
[core@cosa-devsh ~]$ rpm-ostree status -b --json | jq --raw-output '.deployments[0]."base-commit-meta"."ostree.container.image-config" | fromjson | .config.Labels."com.coreos.stream"'
testing-devel
There was a problem hiding this comment.
Hum indeed. I don't know why it worked for me before.
There was a problem hiding this comment.
we still have the annotation for now, so that's why it works either way
3 participants
Get the stream from the
com.coreos.streamannotation from the container image.