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

[daemon] Remove hyperkit migration support #3123

Merged
merged 5 commits into from
Jun 23, 2023
Merged

Conversation

townsend2010
Copy link
Contributor

No description provided.

@codecov
Copy link

codecov bot commented Jun 13, 2023

Codecov Report

Merging #3123 (cad451d) into main (7bedc81) will increase coverage by 1.11%.
The diff coverage is 88.88%.

@@            Coverage Diff             @@
##             main    #3123      +/-   ##
==========================================
+ Coverage   87.50%   88.62%   +1.11%     
==========================================
  Files         238      238              
  Lines       12351    12145     -206     
==========================================
- Hits        10808    10763      -45     
+ Misses       1543     1382     -161     
Impacted Files Coverage Δ
src/client/cli/cmd/launch.cpp 87.58% <ø> (+0.61%) ⬆️
src/daemon/custom_image_host.cpp 100.00% <ø> (ø)
src/daemon/daemon.h 100.00% <ø> (ø)
src/daemon/default_vm_image_vault.cpp 86.35% <ø> (+0.20%) ⬆️
src/daemon/ubuntu_image_host.cpp 94.00% <ø> (-0.08%) ⬇️
include/multipass/vm_image_info.h 80.00% <75.00%> (ø)
src/daemon/daemon.cpp 73.63% <100.00%> (+6.62%) ⬆️
src/platform/backends/lxd/lxd_vm_image_vault.cpp 94.54% <100.00%> (ø)
src/simplestreams/simple_streams_manifest.cpp 93.75% <100.00%> (-0.51%) ⬇️

Copy link
Contributor

@andrei-toterman andrei-toterman left a comment

Choose a reason for hiding this comment

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

Hi, @townsend2010! I ran rg 'hyperkit|\shk\s' -i and found the following

src/daemon/CMakeLists.txt:  scope_guard # TODO hk migration, remove
src/daemon/daemon.cpp:#include <multipass/cloud_init_iso.h> // TODO hk migration, remove
src/daemon/daemon.cpp:#include <multipass/file_ops.h> // TODO hk migration, remove
src/daemon/daemon.cpp:#include <multipass/process/qemuimg_process_spec.h> // TODO hk migration, remove
src/daemon/daemon.cpp:#include <multipass/process/simple_process_spec.h>  // TODO hk migration, remove
src/daemon/daemon.cpp:#include <multipass/standard_paths.h> // TODO hk migration, remove
src/daemon/daemon.cpp:#include <scope_guard.hpp> // TODO hk migration, remove
src/daemon/daemon.cpp:#include <cerrno>  // TODO hk migration, remove
src/daemon/daemon.cpp:#include <cstring> // TODO hk migration, remove
src/daemon/daemon.cpp:#include <iterator> // TODO hk migration, remove
README.md:KVM on Linux, Hyper-V on Windows and HyperKit on macOS to run the VM with minimal
tests/test_daemon_find.cpp:        EXPECT_CALL(mock_settings, get(Eq(mp::driver_key))).WillRepeatedly(Return("nohk")); // TODO hk migration, remove
tests/test_daemon_launch.cpp:        EXPECT_CALL(mock_settings, get(Eq(mp::driver_key))).WillRepeatedly(Return("nohk")); // TODO hk migration, remove
tests/test_daemon.cpp:        EXPECT_CALL(mock_settings, get(Eq(mp::driver_key))).WillRepeatedly(Return("nohk")); // TODO hk migration, remove
tests/test_daemon_start.cpp:        EXPECT_CALL(mock_settings, get(Eq(mp::driver_key))).WillRepeatedly(Return("nohk")); // TODO hk migration, remove

and I assume those should be removed in this PR as well :)

Chris Townsend added 5 commits June 21, 2023 13:42
Copy link
Contributor

@andrei-toterman andrei-toterman left a comment

Choose a reason for hiding this comment

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

LGTM!

bors merge

bors bot added a commit that referenced this pull request Jun 23, 2023
3123: [daemon] Remove hyperkit migration support r=andrei-toterman a=townsend2010



Co-authored-by: Chris Townsend <[email protected]>
@townsend2010
Copy link
Contributor Author

bors will fail, so I'm going to merge manually.

@townsend2010 townsend2010 merged commit 055a80f into main Jun 23, 2023
14 of 15 checks passed
@bors bors bot deleted the remove-hyperkit-support branch June 23, 2023 12:17
@bors
Copy link
Contributor

bors bot commented Jun 23, 2023

This PR was included in a batch that successfully built, but then failed to merge into main (it was a non-fast-forward update). It will be automatically retried.

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.

2 participants