[release/1.6] Update Fedora and EL linux version in vagrant#10339
Merged
mxpv merged 3 commits intocontainerd:release/1.6from Jun 14, 2024
Merged
[release/1.6] Update Fedora and EL linux version in vagrant#10339mxpv merged 3 commits intocontainerd:release/1.6from
mxpv merged 3 commits intocontainerd:release/1.6from
Conversation
Signed-off-by: Akihiro Suda <[email protected]> (cherry picked from commit 08c1e12) Signed-off-by: Derek McGowan <[email protected]>
dmcgowan
changed the title
Signed-off-by: Derek McGowan <[email protected]>
Signed-off-by: Derek McGowan <[email protected]>
samuelkarp
approved these changes
Jun 13, 2024
akhilerm
reviewed
Jun 14, 2024
| config.vm.box_version = ENV["BOX_VERSION"] | ||
| config.vm.box = ENV["BOX"] ? ENV["BOX"].split("@")[0] : "fedora/39-cloud-base" | ||
| # BOX_VERSION is deprecated. Use "BOX=<BOX>@<BOX_VERSION>". | ||
| config.vm.box_version = ENV["BOX_VERSION"] || (ENV["BOX"].split("@")[1] if ENV["BOX"]) |
Member
There was a problem hiding this comment.
we dont have any box currently with @ in the string. This split is needed only if we add rockylinux/[email protected] into the list.
akhilerm
reviewed
Jun 14, 2024
| # The image was changed from rockylinux/8 to almalinux/8, | ||
| # as the former one no longer works: | ||
| # https://github.com/containerd/containerd/pull/10297 | ||
| - almalinux/8 |
Member
There was a problem hiding this comment.
Should we add rockylinux/[email protected] also as in the main branch?
Member
Author
There was a problem hiding this comment.
I removed because it wasn't passing (just timing out, not failing) and it doesn't cover any new cases we are targeting.
mxpv
approved these changes
Jun 14, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Fixes the broken vagrant builds
(cherry picked from commit 08c1e12)