From c4313b31d30b9eac3a6bba7ba89c56b0d3ca5096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Barb=C3=A1chano?= Date: Tue, 29 Oct 2024 19:51:37 +0100 Subject: [PATCH 1/2] test: add Ubuntu 24.10 to popular test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And remove 23.10 since it is EOL Signed-off-by: Pablo Barbáchano --- tools/test-popular-containers/build_rootfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test-popular-containers/build_rootfs.sh b/tools/test-popular-containers/build_rootfs.sh index 547dd73af49..501197949f0 100755 --- a/tools/test-popular-containers/build_rootfs.sh +++ b/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 From 2689dd6348b4436ad58120c6be20eb728227b3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Barb=C3=A1chano?= Date: Mon, 21 Oct 2024 22:06:55 +0200 Subject: [PATCH 2/2] test: drop support for unsupported versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit v1.6.0 has been EOL for a few months already. Signed-off-by: Pablo Barbáchano --- tests/framework/artifacts.py | 4 ---- .../functional/test_cmd_line_parameters.py | 9 --------- 2 files changed, 13 deletions(-) diff --git a/tests/framework/artifacts.py b/tests/framework/artifacts.py index 0283be41941..f4e05a88c94 100644 --- a/tests/framework/artifacts.py +++ b/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"]) diff --git a/tests/integration_tests/functional/test_cmd_line_parameters.py b/tests/integration_tests/functional/test_cmd_line_parameters.py index 3de378a3141..25e47a50e17 100644 --- a/tests/integration_tests/functional/test_cmd_line_parameters.py +++ b/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,