-
Notifications
You must be signed in to change notification settings - Fork 170
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
buildextend-metal: set a sane default container_imgref #3700
Conversation
And drop all the patches for upstream PRs that have merged and made it into v104.
This is a PR upstream [1], but I'd really like it now so in local development the cache doesn't become useless once it feels up (because the current behavior in OSBuild is never evict anything so the cache will fill up eventually and then never be used for anything). Note this patchset includes one additional patch by myself which adds a log statement that prints out when an eviction happens. This is purely for informational purposes so I can know when the cache LRU eviction mechanism is working. [1] osbuild/osbuild#1503
Latest from upstream osbuild/osbuild#1535
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
ok - the |
If one isn't set today it gets set to some random path, which doesn't look great. ``` [core@cosa-devsh ~]$ rpm-ostree status State: idle Deployments: ● ostree-unverified-image:oci-archive:/srv/builds/416.92.202401191455-0/x86_64/rhcos-416.92.202401191455-0-ostree.x86_64.ociarchive Digest: sha256:f0c4175e868ba6c31f67b0ac8143f34e9eadd9f8e1a25615208e5ed18adaa456 Version: 416.92.202401191455-0 (2024-01-19T14:58:17Z) ``` Let's just set a default with just the ociarchive file name in it. ``` [core@cosa-devsh ~]$ rpm-ostree status State: idle Deployments: ● ostree-unverified-image:oci-archive:/rhcos-416.92.202401191512-0-ostree.x86_64.ociarchive Digest: sha256:20757bc5bac0fbe4481760fe3878ff5397901741319caaf85035282df6a31b14 Version: 416.92.202401191512-0 (2024-01-19T15:15:20Z) ```
Pass in the container_imgref just like is done today for create_disk.sh.
Done.. but this also meant I needed to fix a bug in the aleph osbuild stage to handle this (osbuild/osbuild#1548), which I've now backported here too. and... since I was doing a backport for osbuild stuff I went ahead and lumped in my most recent local changes for osbuild patches/updates... I hope that is OK. |
e5d7b7f
to
7d4f612
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
also add support to osbuild mode for passing down the imgref