Skip to content

Commit 931a6ef

Browse files
committed
ci: remove cross-snapshot combinations not working
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]>
1 parent b71a91f commit 931a6ef

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

.buildkite/pipeline_cross.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def restore_step(label, src_instance, src_kv, dst_instance, dst_os, dst_kv):
3838
def cross_steps():
3939
"""Generate group steps"""
4040
instances_x86_64 = ["c5n.metal", "m5n.metal", "m6i.metal", "m6a.metal"]
41-
instances_aarch64 = ["m6g.metal", "m7g.metal"]
41+
instances_aarch64 = ["m7g.metal"]
4242
groups = []
4343
commands = [
4444
"./tools/devtool -y build --release",
@@ -53,7 +53,7 @@ def cross_steps():
5353
commands,
5454
timeout=30,
5555
artifact_paths="snapshots/**/*",
56-
instances=instances_x86_64 + instances_aarch64,
56+
instances=instances_x86_64,
5757
platforms=DEFAULT_PLATFORMS,
5858
)
5959
)
@@ -65,15 +65,10 @@ def cross_steps():
6565
"c5n.metal": ["m5n.metal", "m6i.metal"],
6666
"m5n.metal": ["c5n.metal", "m6i.metal"],
6767
"m6i.metal": ["c5n.metal", "m5n.metal"],
68-
"m6g.metal": ["m7g.metal"],
69-
"m7g.metal": ["m6g.metal"],
7068
}
7169

7270
# https://github.com/firecracker-microvm/firecracker/blob/main/docs/kernel-policy.md#experimental-snapshot-compatibility-across-kernel-versions
73-
aarch64_platforms = [
74-
("al2", "linux_5.10"),
75-
("al2023", "linux_6.1"),
76-
]
71+
aarch64_platforms = [("al2023", "linux_6.1")]
7772
perms_aarch64 = itertools.product(
7873
instances_aarch64, aarch64_platforms, instances_aarch64, aarch64_platforms
7974
)
@@ -91,8 +86,8 @@ def cross_steps():
9186
# the integration tests already test src == dst, so we skip it
9287
if src_instance == dst_instance and src_kv == dst_kv:
9388
continue
94-
# 5.10 -> 4.14 is not supported
95-
if dst_kv == "linux_4.14":
89+
# newer -> older is not supported, and does not work
90+
if src_kv > dst_kv:
9691
continue
9792
if src_instance != dst_instance and dst_instance not in supported.get(
9893
src_instance, []

0 commit comments

Comments
 (0)