From 6bc2a614ba3ffe8e4c33ccbb2d6f9095c1d22236 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 5 Mar 2025 16:45:14 -0800 Subject: [PATCH] os_release eol tests: skip on CANNED, skip match check on rawhide these don't work correctly on IoT. Let's just skip them - testing on the main release should be sufficient. Let's not do the EOL consistency check on Rawhide, as Rawhide EOL is a pretty notional concept. They don't line up ATM and I'm not sure we want to spend too much time trying to make them line up. Let's just focus on Branched. Signed-off-by: Adam Williamson --- tests/os_release.pm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/os_release.pm b/tests/os_release.pm index 4b0269e9..1c3f59c5 100644 --- a/tests/os_release.pm +++ b/tests/os_release.pm @@ -188,14 +188,16 @@ sub run { print "VARIANT_ID was not tested because the compose is not Workstation or Server Edition.\n"; } + unless (get_var("CANNED")) { + # Download Python test script to run the tests. + download_python_tests(); + # Test for EOL date in the distant future. + assert_script_run("~/check-release.py --test future --verbose"); - # Download Python test script to run the tests. - download_python_tests(); - # Test for EOL date in the distant future. - assert_script_run("~/check-release.py --test future --verbose"); - - # Test for EOL dates match each other. - assert_script_run("~/check-release.py --test compare --release $version_id --verbose"); + my $relnum = get_release_number; + # Test for EOL dates match each other. + assert_script_run("~/check-release.py --test compare --release $version_id --verbose") unless ($relnum eq $rawrel); + } # Check for fails, count them, collect their messages and die if something was found. my $failcount = scalar @fails;