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

fix(test): do not use absolute path to true when opening ssh connection #4962

Merged
merged 3 commits into from
Dec 16, 2024

Conversation

Manciukic
Copy link
Contributor

Changes

This change fixes the test-popular-containers suite by using the binary name true when estabilishing the ssh connection instead of the absolute path, and cleaning up the ssh control socket on error before the next retry.

Reason

Fixes #4955

In #4955 the executable to check the ssh connection liveliness was changed from true to /usr/bin/true, but that is not its path in all rootfs, causing failures in the test-popular-containers suite.

Also, since the error is retried but the control socket is not cleaned up, subsequent retries would fail for the assertion.

License Acceptance

By submitting this pull request, I confirm that my contribution is made under
the terms of the Apache 2.0 license. For more information on following Developer
Certificate of Origin and signing off your commits, please check
CONTRIBUTING.md.

PR Checklist

  • I have read and understand CONTRIBUTING.md.
  • I have run tools/devtool checkstyle to verify that the PR passes the
    automated style checks.
  • I have described what is done in these changes, why they are needed, and
    how they are solving the problem in a clear and encompassing way.
  • [NA] I have updated any relevant documentation (both in code and in the docs)
    in the PR.
  • [NA] I have mentioned all user-facing changes in CHANGELOG.md.
  • [NA] If a specific issue led to this PR, this PR closes the issue.
  • [NA] When making API changes, I have followed the
    Runbook for Firecracker API changes.
  • [NA] I have tested all new and changed functionalities in unit tests and/or
    integration tests.
  • [NA] I have linked an issue to every new TODO.

  • This functionality cannot be added in rust-vmm.

@Manciukic Manciukic requested review from pb8o and roypat December 16, 2024 14:26
tests/host_tools/network.py Outdated Show resolved Hide resolved
Copy link

codecov bot commented Dec 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.93%. Comparing base (5c3ff08) to head (1432d80).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4962   +/-   ##
=======================================
  Coverage   83.93%   83.93%           
=======================================
  Files         248      248           
  Lines       27791    27791           
=======================================
  Hits        23327    23327           
  Misses       4464     4464           
Flag Coverage Δ
5.10-c5n.metal 84.51% <ø> (ø)
5.10-m5n.metal 84.49% <ø> (-0.01%) ⬇️
5.10-m6a.metal 83.78% <ø> (-0.01%) ⬇️
5.10-m6g.metal 80.61% <ø> (ø)
5.10-m6i.metal 84.50% <ø> (ø)
5.10-m7g.metal 80.61% <ø> (ø)
6.1-c5n.metal 84.51% <ø> (ø)
6.1-m5n.metal 84.49% <ø> (ø)
6.1-m6a.metal 83.78% <ø> (ø)
6.1-m6g.metal 80.61% <ø> (ø)
6.1-m6i.metal 84.49% <ø> (ø)
6.1-m7g.metal 80.61% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Manciukic Manciukic force-pushed the pr/fix-popular-containers branch from ca0fd64 to 112f6d3 Compare December 16, 2024 14:43
pb8o
pb8o previously approved these changes Dec 16, 2024
In firecracker-microvm#4955 the executable to check the ssh connection liveliness was
changed from `true` to `/usr/bin/true`, but that is not its path in all
rootfs, causing failures in the `test-populat-containers` suite.

Also, since the error is retried but the daemon is not cleaned
up, subsequent retries would fail for the assertion.

This change fixes both issues by using the binary name `true` and
stopping the daemon on error before the next retry.

Fixes: 3b2c2d4 ("test: use single SSH connection for lifetime of microvm")
Signed-off-by: Riccardo Mancini <[email protected]>
@Manciukic Manciukic marked this pull request as ready for review December 16, 2024 17:06
@roypat roypat merged commit 5b8e44a into firecracker-microvm:main Dec 16, 2024
6 of 7 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.

3 participants