Skip to content

Commit 15dd953

Browse files
committed
test: hack: tmp: disable serial for A/B tests
When A/B-testing, the "A" revision firecracker binary does not know about the new --serial-out-path CLI argument. Thus, disable the serial console for all A/B-tests. It gets quite ugly to do for the vulnerability tests, because the .spawn() call is burried deep in the fixtures. This commit should be reverted after merging the PR Signed-off-by: Patrick Roy <[email protected]>
1 parent caefd81 commit 15dd953

File tree

8 files changed

+13
-9
lines changed

8 files changed

+13
-9
lines changed

tests/conftest.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,10 @@ def uvm_booted(
581581
):
582582
"""Return a booted uvm"""
583583
uvm = microvm_factory.build(guest_kernel, rootfs)
584-
uvm.spawn()
584+
if getattr(microvm_factory, "hack_no_serial"):
585+
uvm.spawn(serial_log_file=None)
586+
else:
587+
uvm.spawn()
585588
uvm.basic_config(vcpu_count=vcpu_count, mem_size_mib=mem_size_mib)
586589
uvm.set_cpu_template(cpu_template)
587590
uvm.add_net_iface()

tests/integration_tests/performance/test_block.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def test_block_performance(
176176
Execute block device emulation benchmarking scenarios.
177177
"""
178178
vm = microvm_factory.build(guest_kernel_acpi, rootfs, monitor_memory=False)
179-
vm.spawn(log_level="Info", emit_metrics=True)
179+
vm.spawn(log_level="Info", emit_metrics=True, serial_log_file=None)
180180
vm.basic_config(vcpu_count=vcpus, mem_size_mib=GUEST_MEM_MIB)
181181
vm.add_net_iface()
182182
# Add a secondary block device for benchmark tests.
@@ -227,7 +227,7 @@ def test_block_vhost_user_performance(
227227
"""
228228

229229
vm = microvm_factory.build(guest_kernel_acpi, rootfs, monitor_memory=False)
230-
vm.spawn(log_level="Info", emit_metrics=True)
230+
vm.spawn(log_level="Info", emit_metrics=True, serial_log_file=None)
231231
vm.basic_config(vcpu_count=vcpus, mem_size_mib=GUEST_MEM_MIB)
232232
vm.add_net_iface()
233233

tests/integration_tests/performance/test_boottime.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def test_boottime(
107107
for i in range(10):
108108
vm = microvm_factory.build(guest_kernel_acpi, rootfs_rw)
109109
vm.jailer.extra_args.update({"boot-timer": None})
110-
vm.spawn()
110+
vm.spawn(serial_log_file=None)
111111
vm.basic_config(
112112
vcpu_count=vcpu_count,
113113
mem_size_mib=mem_size_mib,

tests/integration_tests/performance/test_memory_overhead.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def test_memory_overhead(
3939

4040
for _ in range(5):
4141
microvm = microvm_factory.build(guest_kernel_acpi, rootfs, monitor_memory=False)
42-
microvm.spawn(emit_metrics=True)
42+
microvm.spawn(emit_metrics=True, serial_log_file=None)
4343
microvm.basic_config(vcpu_count=vcpu_count, mem_size_mib=mem_size_mib)
4444
microvm.add_net_iface()
4545
microvm.start()

tests/integration_tests/performance/test_network.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def network_microvm(request, microvm_factory, guest_kernel_acpi, rootfs):
4646
guest_vcpus = request.param
4747

4848
vm = microvm_factory.build(guest_kernel_acpi, rootfs, monitor_memory=False)
49-
vm.spawn(log_level="Info", emit_metrics=True)
49+
vm.spawn(log_level="Info", emit_metrics=True, serial_log_file=None)
5050
vm.basic_config(vcpu_count=guest_vcpus, mem_size_mib=guest_mem_mib)
5151
vm.add_net_iface()
5252
vm.start()

tests/integration_tests/performance/test_snapshot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def boot_vm(self, microvm_factory, guest_kernel, rootfs) -> Microvm:
5151
rootfs,
5252
monitor_memory=False,
5353
)
54-
vm.spawn(log_level="Info", emit_metrics=True)
54+
vm.spawn(log_level="Info", emit_metrics=True, serial_log_file=None)
5555
vm.time_api_requests = False
5656
vm.basic_config(
5757
vcpu_count=self.vcpus,
@@ -264,7 +264,7 @@ def test_snapshot_create_latency(
264264
"""Measure the latency of creating a Full snapshot"""
265265

266266
vm = microvm_factory.build(guest_kernel_linux_5_10, rootfs, monitor_memory=False)
267-
vm.spawn()
267+
vm.spawn(serial_log_file=None)
268268
vm.basic_config(
269269
vcpu_count=2,
270270
mem_size_mib=512,

tests/integration_tests/performance/test_vsock.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def test_vsock_throughput(
9595

9696
mem_size_mib = 1024
9797
vm = microvm_factory.build(guest_kernel_acpi, rootfs, monitor_memory=False)
98-
vm.spawn(log_level="Info", emit_metrics=True)
98+
vm.spawn(log_level="Info", emit_metrics=True, serial_log_file=None)
9999
vm.basic_config(vcpu_count=vcpus, mem_size_mib=mem_size_mib)
100100
vm.add_net_iface()
101101
# Create a vsock device

tests/integration_tests/security/test_vulnerabilities.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ def microvm_factory_a(record_property):
211211
bin_dir = git_clone(Path("../build") / revision_a, revision_a).resolve()
212212
record_property("firecracker_bin", str(bin_dir / "firecracker"))
213213
uvm_factory = MicroVMFactory(bin_dir)
214+
uvm_factory.hack_no_serial = True
214215
yield uvm_factory
215216
uvm_factory.kill()
216217

0 commit comments

Comments
 (0)