Skip to content

Disable vagrant strict dependency checking#10950

Merged
dmcgowan merged 1 commit intocontainerd:mainfrom
dmcgowan:vagrant-fix-dep-failure
Nov 5, 2024
Merged

Disable vagrant strict dependency checking#10950
dmcgowan merged 1 commit intocontainerd:mainfrom
dmcgowan:vagrant-fix-dep-failure

Conversation

@dmcgowan
Copy link
Member

@dmcgowan dmcgowan commented Nov 4, 2024

Fixes broken vagrant builds

@k8s-ci-robot
Copy link

k8s-ci-robot commented Nov 4, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@dmcgowan dmcgowan force-pushed the vagrant-fix-dep-failure branch 2 times, most recently from b88ef5e to 67d23bc Compare November 5, 2024 00:08
samuelkarp
samuelkarp reviewed Nov 5, 2024
View reviewed changes
.github/workflows/ci.yml
sudo sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources
sudo apt-get update
sudo apt-get install -y libvirt-daemon libvirt-daemon-system vagrant ovmf
sudo apt-get install -y libvirt-daemon libvirt-daemon-system vagrant=2.4.1-1 ovmf
Copy link
Member

@samuelkarp samuelkarp Nov 5, 2024

Choose a reason for hiding this comment

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

We should add a comment here pointing to hashicorp/vagrant#13532

Copy link
Member Author

@dmcgowan dmcgowan Nov 5, 2024

Choose a reason for hiding this comment

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

Sure, let me see if this gets us passed the error

@dmcgowan
Disable vagrant strict dependency checking
ae73e30 
Fixes broken vagrant builds

Signed-off-by: Derek McGowan <[email protected]>
@dmcgowan dmcgowan force-pushed the vagrant-fix-dep-failure branch from 67d23bc to ae73e30 Compare November 5, 2024 00:19
AkihiroSuda
AkihiroSuda approved these changes Nov 5, 2024
View reviewed changes
Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Seems working

Is this still WIP?

@dmcgowan dmcgowan marked this pull request as ready for review November 5, 2024 00:33
@dosubot dosubot bot added the area/github_actions Pull requests that update GitHub Actions code label Nov 5, 2024
@samuelkarp samuelkarp enabled auto-merge November 5, 2024 00:44
@dmcgowan dmcgowan disabled auto-merge November 5, 2024 00:49
@dmcgowan dmcgowan merged commit c4f797e into containerd:main Nov 5, 2024
@dmcgowan
Copy link
Member Author

dmcgowan commented Nov 5, 2024

Vagrant passed, skipping other flakes

@estesp estesp added cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Nov 7, 2024
@estesp
Copy link
Member

estesp commented Nov 7, 2024

/cherrypick release/1.7

@estesp
Copy link
Member

estesp commented Nov 7, 2024

/cherrypick release/1.6

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Nov 7, 2024

@estesp: #10950 failed to apply on top of branch "release/1.7":

Applying: Disable vagrant strict dependency checking
Using index info to reconstruct a base tree...
M	.github/workflows/ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/ci.yml
CONFLICT (content): Merge conflict in .github/workflows/ci.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Disable vagrant strict dependency checking
Details

In response to this:

/cherrypick release/1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Nov 7, 2024

@estesp: #10950 failed to apply on top of branch "release/1.6":

Applying: Disable vagrant strict dependency checking
Using index info to reconstruct a base tree...
M	.github/workflows/ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/ci.yml
CONFLICT (content): Merge conflict in .github/workflows/ci.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Disable vagrant strict dependency checking
Details

In response to this:

/cherrypick release/1.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@estesp
Copy link
Member

estesp commented Nov 7, 2024

boo robots

This was referenced Nov 7, 2024
Merged
Merged
@estesp estesp removed cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Nov 7, 2024
@estesp estesp added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch labels Nov 7, 2024
@akhilerm akhilerm mentioned this pull request Nov 14, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@samuelkarp samuelkarp samuelkarp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

area/github_actions Pull requests that update GitHub Actions code cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch size/XS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@dmcgowan @k8s-ci-robot @estesp @k8s-infra-cherrypick-robot @samuelkarp @AkihiroSuda