Skip to content
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

e2e: bridge CNI setup fixes for Fedora/containerd. #361

Merged
merged 2 commits into from
Sep 20, 2024

Conversation

klihub
Copy link
Collaborator

@klihub klihub commented Sep 19, 2024

Fix e2e tests runnning with bridge CNI plugin on fedora. In particular,

  • fix non-default CNI plugin binary path on fedora
  • configure bridge CNI plugin earlier during provisoning

These fixes should ensure that the node does not stay lingering in NotReady state, causing false test failures/positives.

Copy link
Collaborator

@askervin askervin left a comment

Choose a reason for hiding this comment

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

I had an issue with a regexp with '(#CNI_NETWORK#)', but it worked fine with only 'CNI_NETWORK'. Would the latter work for you?

@klihub
Copy link
Collaborator Author

klihub commented Sep 19, 2024

I had an issue with a regexp with '(#CNI_NETWORK#)', but it worked fine with only 'CNI_NETWORK'. Would the latter work for you?

Thanks for spotting that ! My tree was not up-to-date, missing your regexp pattern fix commit (plus instead of moving that block earlier it was accidentally copying it). So it recreated the other bug you just fixed and it wouldn't have worked at all. Let me put up an e2e test run to double-check that this committed and pushed version works...

@klihub
Copy link
Collaborator Author

klihub commented Sep 19, 2024

Let me put up an e2e test run to double-check that this committed and pushed version works...

Okay, it looks good. Spun up the VM and the cluster and successfully ran all tests.

test/e2e/playbook/provision.yaml Outdated Show resolved Hide resolved
Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
When using the bridge plugin, configure it earlier, right after
the basic runtime configuration has been created, before NRI is
enabled or the runtime restarted. This should make it sure that
the node does not linger in a NotReady state causing false test
failures.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
Copy link
Collaborator

@askervin askervin left a comment

Choose a reason for hiding this comment

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

LGTM

@askervin askervin merged commit d4e965e into containers:main Sep 20, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants