Skip to content

Commit cf2a74e

Browse files
committed
ci(snapshot): create aarch64 snapshots in cross-restore pipeline
The perms_aarch64 loop expects aarch64 phase1 snapshots to exist for restore steps to consume, but the snapshot-create group was x86-only, so every aarch64 restore step failed at artifact download. Add an aarch64 snapshot-create group and enable test_snapshot_phase1 on arm. Signed-off-by: Jack Thomson <jackabt@amazon.com>
1 parent 2c105b6 commit cf2a74e

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

.buildkite/pipeline_cross.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,17 @@
4545
instances=instances_x86_64,
4646
platforms=DEFAULT_PLATFORMS,
4747
)
48+
49+
# https://github.com/firecracker-microvm/firecracker/blob/main/docs/snapshotting/snapshot-support.md#where-can-i-resume-my-snapshots
50+
aarch64_platforms = [("al2023", "linux_6.1")]
51+
pipeline.build_group(
52+
"snapshot-create-aarch64",
53+
commands,
54+
timeout=30,
55+
artifact_paths="snapshots/**/*",
56+
instances=instances_aarch64,
57+
platforms=aarch64_platforms,
58+
)
4859
pipeline.add_step("wait")
4960

5061
# allow-list of what instances can be restores on what other instances (in
@@ -53,9 +64,6 @@
5364
"m5n.metal": ["m6i.metal"],
5465
"m6i.metal": ["m5n.metal"],
5566
}
56-
57-
# https://github.com/firecracker-microvm/firecracker/blob/main/docs/kernel-policy.md#experimental-snapshot-compatibility-across-kernel-versions
58-
aarch64_platforms = [("al2023", "linux_6.1")]
5967
aarch64_all_platforms = aarch64_platforms + restore_only_platforms
6068
perms_aarch64 = itertools.product(
6169
instances_aarch64, aarch64_platforms, instances_aarch64, aarch64_all_platforms

tests/integration_tests/functional/test_snapshot_phase1.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"""
77

88
import json
9-
import platform
109
import re
1110

1211
import pytest
@@ -18,9 +17,6 @@
1817
)
1918
from framework.utils_cpu_templates import get_cpu_template_name
2019

21-
if platform.machine() != "x86_64":
22-
pytestmark = pytest.mark.skip("only x86_64 architecture supported")
23-
2420
# Default IPv4 address to route MMDS requests.
2521
IPV4_ADDRESS = "169.254.169.254"
2622
NET_IFACE_FOR_MMDS = "eth3"

0 commit comments

Comments
 (0)