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

Forward-Port 1.5 branch hot-fixes + correctly bump snapshot version for 1.6 #4169

Merged
merged 8 commits into from
Oct 12, 2023

Conversation

roypat
Copy link
Contributor

@roypat roypat commented Oct 12, 2023

It seems a rebase gone awry caused the version bump from #3557 to be
considered as part of 1.5, even though it will only land with 1.6. Swap
the two lines to unblock CI.

Also includes some commits from the 1.5 branch

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

  • If a specific issue led to this PR, this PR closes the issue.
  • The description of changes is clear and encompassing.
  • Any required documentation changes (code and docs) are included in this PR.
  • API changes follow the Runbook for Firecracker API changes.
  • User-facing changes are mentioned in CHANGELOG.md.
  • All added/changed functionality is tested.
  • New TODOs link to an issue.
  • Commits meet contribution quality standards.

  • This functionality cannot be added in rust-vmm.

Was forgotten to be added before.

Signed-off-by: Patrick Roy <[email protected]>
File is only for humans, sorry.

Signed-off-by: Patrick Roy <[email protected]>
So I don't have to wait over an hour to see if it worked or not.

Also remove a `touch build.rs` that was leftover from when we needed the
buildscript to determine the firecracker version.

Signed-off-by: Patrick Roy <[email protected]>
In the pre-release testing environment everything seems slower, and it
keeps failing with hitting this timeout.

Signed-off-by: Patrick Roy <[email protected]>
It is flaky due to concurrent microVMs holding networking locks in the
kernel, causing delays on net device attachments.

Signed-off-by: Patrick Roy <[email protected]>
It seems a rebase gone awry caused the version bump from firecracker-microvm#3557 to be
considered as part of 1.5, even though it will only land with 1.6. Swap
the two lines to unblock CI.

Signed-off-by: Patrick Roy <[email protected]>
@codecov
Copy link

codecov bot commented Oct 12, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (bce88d6) 82.98% compared to head (e3a3c41) 82.98%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4169   +/-   ##
=======================================
  Coverage   82.98%   82.98%           
=======================================
  Files         223      223           
  Lines       28508    28508           
=======================================
  Hits        23656    23656           
  Misses       4852     4852           
Flag Coverage Δ
4.14-c7g.metal 78.51% <ø> (+<0.01%) ⬆️
4.14-m5d.metal 80.32% <ø> (ø)
4.14-m6a.metal 79.45% <ø> (ø)
4.14-m6g.metal 78.51% <ø> (ø)
4.14-m6i.metal 80.30% <ø> (ø)
5.10-c7g.metal 81.44% <ø> (ø)
5.10-m5d.metal 83.00% <ø> (ø)
5.10-m6a.metal 82.24% <ø> (ø)
5.10-m6g.metal 81.44% <ø> (ø)
5.10-m6i.metal 82.99% <ø> (+<0.01%) ⬆️
6.1-c7g.metal 81.44% <ø> (ø)
6.1-m5d.metal 83.00% <ø> (ø)
6.1-m6a.metal 82.24% <ø> (ø)
6.1-m6g.metal 81.44% <ø> (ø)
6.1-m6i.metal 82.99% <ø> (+<0.01%) ⬆️

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.

@roypat roypat marked this pull request as ready for review October 12, 2023 09:31
pb8o
pb8o previously approved these changes Oct 12, 2023
kalyazin
kalyazin previously approved these changes Oct 12, 2023
Didnt happen as part of post-relase preparation because it was not
listed as an artifact then.

Signed-off-by: Patrick Roy <[email protected]>
Move unreleased thigns to [1.5.0], because we released 1.5.0

Signed-off-by: Patrick Roy <[email protected]>
@roypat roypat force-pushed the forward-ports-plus-fix branch from 8bf817e to e3a3c41 Compare October 12, 2023 10:25
@roypat roypat merged commit 5530e4c into firecracker-microvm:main Oct 12, 2023
4 of 5 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