Skip to content

[release/1.7] backport: Disable vagrant strict dependency checking#10965

Merged
dmcgowan merged 1 commit into
containerd:release/1.7from
estesp:cp-10950-1.7
Nov 8, 2024
Merged

[release/1.7] backport: Disable vagrant strict dependency checking#10965
dmcgowan merged 1 commit into
containerd:release/1.7from
estesp:cp-10950-1.7

Conversation

@estesp

@estesp estesp commented Nov 7, 2024

Copy link
Copy Markdown
Member

Fixes broken vagrant builds

From #10950
(cherry picked from commit ae73e30)

Fixes broken vagrant builds

Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit ae73e30)
Signed-off-by: Phil Estes <estesp@gmail.com>
@dosubot dosubot Bot added the area/github_actions Pull requests that update GitHub Actions code label Nov 7, 2024
Comment thread .github/workflows/ci.yml
Comment on lines +580 to +581
# https://github.com/vagrant-libvirt/vagrant-libvirt/issues/1725#issuecomment-1454058646
sudo cp /usr/share/OVMF/OVMF_VARS_4M.fd /var/lib/libvirt/qemu/nvram/

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add that this change is cherry-picked from 1db0064

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

officially through git cherry-pick -x or you think it needs a comment?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer the cherry-pick -x.

I think its still working fine without the other changes (setting nvram in vagrant file) in the above mentioned commit because we are still on ubuntu-22.04 in release branch. But once we upgrade we are anyway going to need those changes.

@dmcgowan dmcgowan merged commit 3a34579 into containerd:release/1.7 Nov 8, 2024
@estesp estesp deleted the cp-10950-1.7 branch November 8, 2024 04:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/github_actions Pull requests that update GitHub Actions code size/XS

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants