Skip to content

Commit f9ec357

Browse files
authored
Merge branch 'main' into tests/parametrize_benchmark
2 parents 3222c42 + a5ffb7a commit f9ec357

File tree

42 files changed

+422
-234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+422
-234
lines changed

.buildkite/common.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ def __call__(self, parser, namespace, value, option_string=None):
139139
res = getattr(namespace, self.dest, {})
140140
key_str, val = value.split("=", maxsplit=1)
141141
keys = key_str.split("/")
142-
update = {keys[-1]: ast.literal_eval(val)}
142+
# Interpret it as a literal iff it starts like one
143+
update = {keys[-1]: ast.literal_eval(val) if val[0] in "[{'" else val}
143144
for key in list(reversed(keys))[1:]:
144145
update = {key: update}
145146
res = overlay_dict(res, update)

.buildkite/pipeline_cross.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
f"buildkite-agent artifact download snapshots/{src_instance}_{src_kv}.tar .",
8686
f"tar xSvf snapshots/{src_instance}_{src_kv}.tar",
8787
*pipeline.devtool_test(
88-
pytest_opts=f"-m nonci -n4 {k_val} integration_tests/functional/test_snapshot_restore_cross_kernel.py",
88+
pytest_opts=f"-m nonci -n8 --dist worksteal {k_val} integration_tests/functional/test_snapshot_restore_cross_kernel.py",
8989
),
9090
],
9191
"label": f"🎬 {src_instance} {src_kv} ➡️ {dst_instance} {dst_kv}",

.buildkite/pipeline_perf.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,7 @@
121121
# }
122122
# will pin steps running on instances "m6i.metal" with kernel version tagged "linux_6.1"
123123
# to a new kernel version tagged "linux_6.1-pinned"
124-
pins = {
125-
# TODO: Unpin when performance instability on m6i/5.10 has gone.
126-
"linux_5.10-pinned": {"instance": "m6i.metal", "kv": "linux_5.10"},
127-
# TODO: Unpin when performance instability on m6i/6.1 has gone.
128-
"linux_6.1-pinned": {"instance": "m6i.metal", "kv": "linux_6.1"},
129-
}
124+
pins = {}
130125

131126

132127
def apply_pins(steps):

.buildkite/pipeline_pr.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
pipeline.build_group(
7777
"⚙ Functional and security 🔒",
7878
pipeline.devtool_test(
79-
pytest_opts="-n 8 --dist worksteal integration_tests/{{functional,security}}",
79+
pytest_opts="-n 16 --dist worksteal integration_tests/{{functional,security}}",
8080
),
8181
)
8282

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ and this project adheres to
2525

2626
- [#4921](https://github.com/firecracker-microvm/firecracker/pull/4921): Fixed
2727
swagger `CpuConfig` definition to include missing aarch64-specific fields.
28+
- [#4916](https://github.com/firecracker-microvm/firecracker/pull/4916): Fixed
29+
`IovDeque` implementation to work with any host page size. This fixes
30+
virtio-net device on non 4K host kernels.
2831

2932
## [1.10.1]
3033

0 commit comments

Comments
 (0)