From 1b355487cec8ee54cd73dbb08202514832da696c Mon Sep 17 00:00:00 2001 From: James Falcon Date: Fri, 23 Feb 2024 15:18:45 -0600 Subject: [PATCH] test: limit temp dhcp6 changes to < NOBLE (#4942) #4474 landed in Noble, so this block isn't needed. --- tests/integration_tests/test_upgrade.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/integration_tests/test_upgrade.py b/tests/integration_tests/test_upgrade.py index f52d31c4e89..0cdee8bb9a8 100644 --- a/tests/integration_tests/test_upgrade.py +++ b/tests/integration_tests/test_upgrade.py @@ -8,7 +8,12 @@ from tests.integration_tests.clouds import IntegrationCloud from tests.integration_tests.conftest import get_validated_source from tests.integration_tests.integration_settings import PLATFORM -from tests.integration_tests.releases import CURRENT_RELEASE, FOCAL, IS_UBUNTU +from tests.integration_tests.releases import ( + CURRENT_RELEASE, + FOCAL, + IS_UBUNTU, + NOBLE, +) from tests.integration_tests.util import verify_clean_log LOG = logging.getLogger("integration_testing.test_upgrade") @@ -138,7 +143,7 @@ def test_clean_boot_of_upgraded_package(session_cloud: IntegrationCloud): assert post_json["v1"]["datasource"].startswith( "DataSourceAzure" ) - if PLATFORM in ["gce", "qemu"]: + if PLATFORM in ["gce", "qemu"] and CURRENT_RELEASE < NOBLE: # GCE regenerates network config per boot AND # GCE uses fallback config AND # #4474 changed fallback configuration.