Skip to content

mana: enable mana keepalive by default for tests #2461

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

mana: enable mana keepalive by default for tests #2461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions petri/src/vm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,6 +1299,10 @@ impl OpenHclConfig {
/// the command line and log levels.
pub fn command_line(&self) -> String {
let mut cmdline = self.command_line.clone();

// Enable MANA keep-alive by default for all tests
append_cmdline(&mut cmdline, "OPENHCL_MANA_KEEP_ALIVE=host,privatepool");

match &self.log_levels {
OpenHclLogConfig::TestDefault => {
let default_log_levels = {
Expand Down
2 changes: 1 addition & 1 deletion petri/src/vm/openvmm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ impl PetriVmmBackend for OpenVmmPetriBackend {
fn default_servicing_flags() -> OpenHclServicingFlags {
OpenHclServicingFlags {
enable_nvme_keepalive: true,
enable_mana_keepalive: false,
enable_mana_keepalive: true,
override_version_checks: false,
stop_timeout_hint_secs: None,
}
Expand Down
4 changes: 1 addition & 3 deletions vmm_tests/vmm_tests/tests/tests/multiarch/openhcl_servicing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,9 +556,7 @@ async fn mana_nic_servicing_keepalive(
let (mut vm, agent) = config
.with_vmbus_redirect(true)
.modify_backend(|b| b.with_nic())
.with_openhcl_command_line(
"OPENHCL_ENABLE_VTL2_GPA_POOL=512 OPENHCL_MANA_KEEP_ALIVE=host,privatepool",
)
.with_openhcl_command_line("OPENHCL_ENABLE_VTL2_GPA_POOL=512")
.run()
.await?;

Expand Down
Loading