Skip to content

Commit

Permalink
ci: remove cross-snapshot combinations not working
Browse files Browse the repository at this point in the history
Remove the combinations that were added while this test was
falsely working but never worked:

- x86 snapshot in host 6.1 -> restore in host 5.10
- arm m6g all combinations, m7g host 4.14 and host 5.10

Signed-off-by: Pablo Barbáchano <[email protected]>
  • Loading branch information
pb8o committed Jun 5, 2024
1 parent b71a91f commit 931a6ef
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions .buildkite/pipeline_cross.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def restore_step(label, src_instance, src_kv, dst_instance, dst_os, dst_kv):
def cross_steps():
"""Generate group steps"""
instances_x86_64 = ["c5n.metal", "m5n.metal", "m6i.metal", "m6a.metal"]
instances_aarch64 = ["m6g.metal", "m7g.metal"]
instances_aarch64 = ["m7g.metal"]
groups = []
commands = [
"./tools/devtool -y build --release",
Expand All @@ -53,7 +53,7 @@ def cross_steps():
commands,
timeout=30,
artifact_paths="snapshots/**/*",
instances=instances_x86_64 + instances_aarch64,
instances=instances_x86_64,
platforms=DEFAULT_PLATFORMS,
)
)
Expand All @@ -65,15 +65,10 @@ def cross_steps():
"c5n.metal": ["m5n.metal", "m6i.metal"],
"m5n.metal": ["c5n.metal", "m6i.metal"],
"m6i.metal": ["c5n.metal", "m5n.metal"],
"m6g.metal": ["m7g.metal"],
"m7g.metal": ["m6g.metal"],
}

# https://github.com/firecracker-microvm/firecracker/blob/main/docs/kernel-policy.md#experimental-snapshot-compatibility-across-kernel-versions
aarch64_platforms = [
("al2", "linux_5.10"),
("al2023", "linux_6.1"),
]
aarch64_platforms = [("al2023", "linux_6.1")]
perms_aarch64 = itertools.product(
instances_aarch64, aarch64_platforms, instances_aarch64, aarch64_platforms
)
Expand All @@ -91,8 +86,8 @@ def cross_steps():
# the integration tests already test src == dst, so we skip it
if src_instance == dst_instance and src_kv == dst_kv:
continue
# 5.10 -> 4.14 is not supported
if dst_kv == "linux_4.14":
# newer -> older is not supported, and does not work
if src_kv > dst_kv:
continue
if src_instance != dst_instance and dst_instance not in supported.get(
src_instance, []
Expand Down

0 comments on commit 931a6ef

Please sign in to comment.