Skip to content

[release/1.7] test: added runc v1 tests using vagrant#11896

Merged
dmcgowan merged 1 commit intocontainerd:release/1.7from
Madraceee:vagrant_v1_tests
Jun 3, 2025
Merged

[release/1.7] test: added runc v1 tests using vagrant#11896
dmcgowan merged 1 commit intocontainerd:release/1.7from
Madraceee:vagrant_v1_tests

Conversation

@Madraceee
Copy link

fix: #11830

Added jobs to ci.yml to test runc v1 using vagrant
ping @akhilerm

@k8s-ci-robot
Copy link

Hi @Madraceee. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

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.

@dosubot dosubot bot added github_actions Pull requests that update GitHub Actions code kind/test labels May 26, 2025
@Madraceee
Copy link
Author

The same tests seems to be working fine after re-running them again. Is it possible to retrigger the failed cases?

@akhilerm
Copy link
Member

/ok-to-test

@akhilerm
Copy link
Member

/retest

You can use /retest comment to retrigger the failed tests.

- name: test-cri
run: sudo BOX=$BOX vagrant up --provision-with=selinux,install-runc,install-gotestsum,test-cri

integration-vagrant-v1:
Copy link
Member

Choose a reason for hiding this comment

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

WDYT of adding it to the above integration-vagrant itself, using http://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/running-variations-of-jobs-in-a-workflow#expanding-or-adding-matrix-configurations for io.containerd.runc.v1, io.containerd.runtime.v1.linux so we can test v1 shim only on almalinux/8

Copy link
Author

@Madraceee Madraceee May 27, 2025

Choose a reason for hiding this comment

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

Sure, I will make the change and update the PR.

Is there anything else you would like me to change? Or is the changes good?

Copy link
Member

Choose a reason for hiding this comment

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

Rest of the changes are good.

@AkihiroSuda AkihiroSuda changed the title test: added runc v1 tests using vagrant [release/1.7] test: added runc v1 tests using vagrant May 28, 2025
@akhilerm
Copy link
Member

Can you update the second commift for whitespace errors. ? Ref: https://github.com/containerd/containerd/actions/runs/15303471746/job/43049980393?pr=11896

@Madraceee
Copy link
Author

How do I exactly fix this?
The new commit with the change is failing as well.
I am not aware of any other way to edit a previous commit other than doing a reset.

@austinvazquez
Copy link
Member

austinvazquez commented May 28, 2025

@Madraceee, you can rebase on the base branch (i.e. git rebase -i release/1.7) and add a break point after the commit you want to modify. Then you can make your changes and amend the commit (git commit -a -s --amend).

While you have the hood open, it is probably fine to squash the commits as well. I don't think having seperate commits would bring much value in this case.

Signed-off-by: Nitheesh Raaja R <raajanitheesh@gmail.com>
@Madraceee
Copy link
Author

@austinvazquez , I have done the steps u mentioned and squashed it into a single commit. Since there is a difference between the remote and local, git wont allow me to push unless I use --force. I just want to confirm before doing that step. If there is any other way, do let me know.

@austinvazquez
Copy link
Member

Oh yep, I should have mentioned that. A force push is required after amending any commits.

@Madraceee
Copy link
Author

/retest

@akhilerm
Copy link
Member

The CI Fuzz failure is unrelated. Its now being hit across release/1.7 branch

@Madraceee
Copy link
Author

The Linux integration test was failing as well. So retriggered to make sure it works.

@Madraceee
Copy link
Author

@akhilerm hope this PR fulfills #11830 for release/1.7. I will start working on release/1.6.

@austinvazquez Thanks for the git tricks!!

Copy link
Member

@austinvazquez austinvazquez left a comment

Choose a reason for hiding this comment

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

Thanks for pushing this through.

@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review May 28, 2025
@dmcgowan dmcgowan merged commit aca9d76 into containerd:release/1.7 Jun 3, 2025
97 of 102 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Jun 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

github_actions Pull requests that update GitHub Actions code kind/test ok-to-test size/S

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

5 participants