Merge branch 'main' into ab-simplification

Author: roypat

tests/framework/artifacts.py

@@ -8,7 +8,6 @@
 from pathlib import Path
 from typing import Iterator
 
-import packaging.version
 import pytest
 
 from framework.defs import ARTIFACT_DIR
@@ -98,9 +97,6 @@ def snapshot_version_tuple(self):
         # independent of Firecracker versions. For these Firecracker versions, use
         # the --snapshot-version Firecracker flag, to figure out which snapshot version
         # it supports.
-        # TODO: remove this check once all version up to (and including) 1.6.0 go out of support.
-        if packaging.version.parse(self.version) < packaging.version.parse("1.7.0"):
-            return self.version_tuple[:2] + (0,)
 
         return (
             check_output([self.path, "--snapshot-version"])

tests/integration_tests/functional/test_cmd_line_parameters.py

@@ -5,7 +5,6 @@
 import subprocess
 from pathlib import Path
 
-import packaging.version
 import pytest
 
 from framework.utils import check_output
@@ -22,14 +21,6 @@ def test_describe_snapshot_all_versions(
     snapshot state file.
     """
 
-    # TODO: remove this check once all versions prior to 1.6.0 go out of support.
-    if packaging.version.parse(firecracker_release.version) < packaging.version.parse(
-        "1.7.0"
-    ):
-        pytest.skip(
-            "We can't parse snapshot files created from Firecracker with version < 1.7.0."
-        )
-
     target_version = firecracker_release.snapshot_version
     vm = microvm_factory.build(
         guest_kernel,

tools/test-popular-containers/build_rootfs.sh

@@ -67,6 +67,6 @@ EOF
 
 make_rootfs alpine:latest
 make_rootfs ubuntu:22.04
-make_rootfs ubuntu:23.10
 make_rootfs ubuntu:24.04
+make_rootfs ubuntu:24.10
 # make_rootfs ubuntu:latest